From 116f5a253c4ce388b56f0b5a2eb7a6b16d545842 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Wed, 18 Feb 2026 12:22:01 +0100
Subject: [PATCH 1/3] Bazel: Update Rust toolchain to nightly/2026-01-22 and
 rules_rust to 0.68.1.codeql.1

Update the Rust nightly toolchain from nightly/2025-08-01 to nightly/2026-01-22
(rustc 1.95.0-nightly), and rules_rust from 0.66.0 to 0.68.1.codeql.1.

The new nightly changed how stdlib metadata is distributed: .rlib files now
contain only a metadata stub, with full metadata in separate .rmeta files.
rules_rust's stdlib glob doesn't include *.rmeta, causing 'only metadata stub
found' errors. This is patched via a custom registry entry (0.68.1.codeql.1).

Upstream bug: https://github.com/bazelbuild/rules_rust/issues/3859
---
 MODULE.bazel                                  |  44 ++---
 .../rules_rust/0.68.1.codeql.1/MODULE.bazel   | 151 ++++++++++++++++++
 .../patches/include_rmeta_in_stdlib.patch     |  12 ++
 .../rules_rust/0.68.1.codeql.1/source.json    |   9 ++
 .../registry/modules/rules_rust/metadata.json |  11 ++
 .../src/nightly-toolchain/rust-toolchain.toml |   2 +-
 rust/ql/test/rust-toolchain.toml              |   2 +-
 7 files changed, 207 insertions(+), 24 deletions(-)
 create mode 100644 misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel
 create mode 100644 misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch
 create mode 100644 misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json
 create mode 100644 misc/bazel/registry/modules/rules_rust/metadata.json

diff --git a/MODULE.bazel b/MODULE.bazel
index 9b326127ce7b..5ace37479cb4 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -28,7 +28,7 @@ bazel_dep(name = "rules_kotlin", version = "2.2.0-codeql.1")
 bazel_dep(name = "gazelle", version = "0.40.0")
 bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.66.0")
+bazel_dep(name = "rules_rust", version = "0.68.1.codeql.1")
 bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
@@ -41,7 +41,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/2025-08-01"
+RUST_VERSION = "nightly/2026-01-22"
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
@@ -53,26 +53,26 @@ rust.toolchain(
     ],
     # generated by buildutils-internal/scripts/fill-rust-sha256s.py (internal repo)
     sha256s = {
-        "2025-08-01/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "9bbeaf5d3fc7247d31463a9083aa251c995cc50662c8219e7a2254d76a72a9a4",
-        "2025-08-01/rustc-nightly-x86_64-apple-darwin.tar.xz": "c9ea539a8eff0d5d162701f99f9e1aabe14dd0dfb420d62362817a5d09219de7",
-        "2025-08-01/rustc-nightly-aarch64-apple-darwin.tar.xz": "ae83feebbc39cfd982e4ecc8297731fe79c185173aee138467b334c5404b3773",
-        "2025-08-01/rustc-nightly-x86_64-pc-windows-msvc.tar.xz": "9f170c30d802a349be60cf52ec46260802093cb1013ad667fc0d528b7b10152f",
-        "2025-08-01/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "9ae5f3cd8f557c4f6df522597c69d14398cf604cfaed2b83e767c4b77a7eaaf6",
-        "2025-08-01/clippy-nightly-x86_64-apple-darwin.tar.xz": "983cb9ee0b6b968188e04ab2d33743d54764b2681ce565e1b3f2b9135c696a3e",
-        "2025-08-01/clippy-nightly-aarch64-apple-darwin.tar.xz": "ed2219dbc49d088225e1b7c5c4390fa295066e071fddaa2714018f6bb39ddbf0",
-        "2025-08-01/clippy-nightly-x86_64-pc-windows-msvc.tar.xz": "911f40ab5cbdd686f40e00965271fe47c4805513a308ed01f30eafb25b448a50",
-        "2025-08-01/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "106463c284e48e4904c717471eeec2be5cc83a9d2cae8d6e948b52438cad2e69",
-        "2025-08-01/cargo-nightly-x86_64-apple-darwin.tar.xz": "6ad35c40efc41a8c531ea43235058347b6902d98a9693bf0aed7fc16d5590cef",
-        "2025-08-01/cargo-nightly-aarch64-apple-darwin.tar.xz": "dd28c365e9d298abc3154c797720ad36a0058f131265c9978b4c8e4e37012c8a",
-        "2025-08-01/cargo-nightly-x86_64-pc-windows-msvc.tar.xz": "7b431286e12d6b3834b038f078389a00cac73f351e8c3152b2504a3c06420b3b",
-        "2025-08-01/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "e342e305d7927cc288d386983b2bc253cfad3776b113386e903d0b302648ef47",
-        "2025-08-01/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "e44dd3506524d85c37b3a54bcc91d01378fd2c590b2db5c5974d12f05c1b84d1",
-        "2025-08-01/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "0c1b5f46dd81be4a9227b10283a0fcaa39c14fea7e81aea6fd6d9887ff6cdc41",
-        "2025-08-01/llvm-tools-nightly-x86_64-pc-windows-msvc.tar.xz": "423e5fd11406adccbc31b8456ceb7375ce055cdf45e90d2c3babeb2d7f58383f",
-        "2025-08-01/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "3c0ceb46a252647a1d4c7116d9ccae684fa5e42aaf3296419febd2c962c3b41d",
-        "2025-08-01/rust-std-nightly-x86_64-apple-darwin.tar.xz": "3be416003cab10f767390a753d1d16ae4d26c7421c03c98992cf1943e5b0efe8",
-        "2025-08-01/rust-std-nightly-aarch64-apple-darwin.tar.xz": "4046ac0ef951cb056b5028a399124f60999fa37792eab69d008d8d7965f389b4",
-        "2025-08-01/rust-std-nightly-x86_64-pc-windows-msvc.tar.xz": "191ed9d8603c3a4fe5a7bbbc2feb72049078dae2df3d3b7d5dedf3abbf823e6e",
+        "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",
     },
     versions = [RUST_VERSION],
 )
diff --git a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel
new file mode 100644
index 000000000000..aedc5a8a242e
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel
@@ -0,0 +1,151 @@
+"""bazelbuild/rules_rust"""
+
+module(
+    name = "rules_rust",
+    version = "0.68.1.codeql.1",
+)
+
+###############################################################################
+## Core
+###############################################################################
+
+bazel_dep(name = "bazel_features", version = "1.32.0")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.4")
+bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
+bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
+
+internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
+use_repo(
+    internal_deps,
+    "rrra",
+    "rrra__anyhow-1.0.71",
+    "rrra__camino-1.1.9",
+    "rrra__clap-4.3.11",
+    "rrra__env_logger-0.10.0",
+    "rrra__itertools-0.11.0",
+    "rrra__log-0.4.19",
+    "rrra__serde-1.0.171",
+    "rrra__serde_json-1.0.102",
+    "rules_rust_tinyjson",
+)
+
+cargo_internal_deps = use_extension("//cargo/private:internal_extensions.bzl", "i")
+use_repo(
+    cargo_internal_deps,
+    "rrc",
+    "rrc__cargo-util-schemas-0.3.1",
+    "rrc__cargo_toml-0.20.5",
+    "rrc__pathdiff-0.1.0",
+    "rrc__semver-1.0.25",
+    "rrc__toml-0.8.20",
+)
+
+rust = use_extension("//rust:extensions.bzl", "rust")
+rust.toolchain(edition = "2021")
+use_repo(rust, "rust_toolchains")
+
+register_toolchains(
+    "@rust_toolchains//:all",
+)
+
+rust_host_tools = use_extension("//rust:extensions.bzl", "rust_host_tools")
+rust_host_tools.host_tools(
+    name = "rust_host_tools",
+)
+use_repo(
+    rust_host_tools,
+    "rust_host_tools",
+)
+
+rust_test = use_extension("//test:test_extensions.bzl", "rust_test", dev_dependency = True)
+use_repo(
+    rust_test,
+    "buildkite_config",
+    "generated_inputs_in_external_repo",
+    "libc",
+    "rtra",
+    "rtra__serde-1.0.228",
+    "rtra__serde_json-1.0.145",
+    "rtvsc",
+    "rtvsc__serde-1.0.228",
+    "rtvsc__serde_json-1.0.145",
+    "rules_rust_test_load_arbitrary_tool",
+    "rules_rust_toolchain_test_target_json",
+)
+
+bazel_dep(name = "rules_python", version = "0.40.0", dev_dependency = True)
+bazel_dep(name = "rules_testing", version = "0.7.0", dev_dependency = True)
+bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
+
+###############################################################################
+## Crate Universe
+###############################################################################
+
+crate_universe_internal_deps = use_extension(
+    "//crate_universe/private:internal_extensions.bzl",
+    "cu",
+)
+use_repo(
+    crate_universe_internal_deps,
+    "cargo_bazel.buildifier-darwin-amd64",
+    "cargo_bazel.buildifier-darwin-arm64",
+    "cargo_bazel.buildifier-linux-amd64",
+    "cargo_bazel.buildifier-linux-arm64",
+    "cargo_bazel.buildifier-windows-amd64.exe",
+    "cui",
+    "cui__anyhow-1.0.98",
+    "cui__camino-1.1.9",
+    "cui__cargo-lock-10.1.0",
+    "cui__cargo-platform-0.1.9",
+    "cui__cargo_metadata-0.19.2",
+    "cui__cargo_toml-0.22.1",
+    "cui__cfg-expr-0.18.0",
+    "cui__clap-4.5.37",
+    "cui__crates-index-3.7.0",
+    "cui__glob-0.3.2",
+    "cui__hex-0.4.3",
+    "cui__indoc-2.0.6",
+    "cui__itertools-0.14.0",
+    "cui__maplit-1.0.2",
+    "cui__normpath-1.3.0",
+    "cui__once_cell-1.21.3",
+    "cui__pathdiff-0.2.3",
+    "cui__regex-1.11.1",
+    "cui__semver-1.0.26",
+    "cui__serde-1.0.219",
+    "cui__serde_json-1.0.140",
+    "cui__serde_starlark-0.1.17",
+    "cui__sha2-0.10.8",
+    "cui__spdx-0.10.8",
+    "cui__tempfile-3.19.1",
+    "cui__tera-1.20.0",
+    "cui__textwrap-0.16.2",
+    "cui__toml-0.8.21",
+    "cui__tracing-0.1.41",
+    "cui__tracing-subscriber-0.3.19",
+    "cui__url-2.5.4",
+    "cui__walkdir-2.5.0",
+)
+
+crate_universe_internal_non_repro_deps = use_extension(
+    "//crate_universe/private:internal_extensions.bzl",
+    "cu_nr",
+)
+use_repo(
+    crate_universe_internal_non_repro_deps,
+    "cargo_bazel_bootstrap",
+)
+
+crate_universe_internal_dev_deps = use_extension(
+    "//crate_universe/private:internal_extensions.bzl",
+    "cu_dev",
+    dev_dependency = True,
+)
+use_repo(
+    crate_universe_internal_dev_deps,
+    "cross_rs",
+    "cross_rs_host_bin",
+)
diff --git a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch
new file mode 100644
index 000000000000..3707cb51b636
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch
@@ -0,0 +1,12 @@
+diff --git a/rust/private/repository_utils.bzl b/rust/private/repository_utils.bzl
+index 05b741947..f88074af6 100644
+--- a/rust/private/repository_utils.bzl
++++ b/rust/private/repository_utils.bzl
+@@ -280,6 +280,7 @@ rust_stdlib_filegroup(
+     srcs = glob(
+         [
+             "lib/rustlib/{target_triple}/lib/*.rlib",
++            "lib/rustlib/{target_triple}/lib/*.rmeta",
+             "lib/rustlib/{target_triple}/lib/*{dylib_ext}*",
+             "lib/rustlib/{target_triple}/lib/*{staticlib_ext}",
+             "lib/rustlib/{target_triple}/lib/self-contained/**",
diff --git a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json
new file mode 100644
index 000000000000..6048521ce2fd
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json
@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-yKqAbPYGZnmsI0YyQe6ArWkiZdrQRl9RERy74wuJA1I=",
+    "strip_prefix": "",
+    "url": "https://github.com/bazelbuild/rules_rust/releases/download/0.68.1/rules_rust-0.68.1.tar.gz",
+    "patches": {
+        "include_rmeta_in_stdlib.patch": "sha256-7n8XHpfkLUMEbRG6lKqdhLWydsWlRRG+Ywkxk6LvY9c="
+    },
+    "patch_strip": 1
+}
diff --git a/misc/bazel/registry/modules/rules_rust/metadata.json b/misc/bazel/registry/modules/rules_rust/metadata.json
new file mode 100644
index 000000000000..deffe6f6dfad
--- /dev/null
+++ b/misc/bazel/registry/modules/rules_rust/metadata.json
@@ -0,0 +1,11 @@
+{
+    "homepage": "https://github.com/bazelbuild/rules_rust",
+    "maintainers": [],
+    "repository": [
+        "github:bazelbuild/rules_rust"
+    ],
+    "versions": [
+        "0.68.1.codeql.1"
+    ],
+    "yanked_versions": {}
+}
diff --git a/rust/extractor/src/nightly-toolchain/rust-toolchain.toml b/rust/extractor/src/nightly-toolchain/rust-toolchain.toml
index 7ed21df91218..4e2d228630ef 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-01-22"
 components = [ "rust-src" ]
diff --git a/rust/ql/test/rust-toolchain.toml b/rust/ql/test/rust-toolchain.toml
index 9343bef27c61..15f54ec6b429 100644
--- a/rust/ql/test/rust-toolchain.toml
+++ b/rust/ql/test/rust-toolchain.toml
@@ -2,6 +2,6 @@
 # IMPORTANT: this can also have an impact on QL test results
 
 [toolchain]
-channel = "1.90"
+channel = "1.93"
 profile = "minimal"
 components = [ "rust-src" ]

From 24f3d9ede0653357329ba38e3768b319e38f2ddd Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Wed, 18 Feb 2026 13:56:48 +0100
Subject: [PATCH 2/3] Revert rust-toolchain.toml changes and update test
 expectations

---
 .../src/nightly-toolchain/rust-toolchain.toml |  2 +-
 .../NeverTypeRepr/NeverTypeRepr.expected      |  1 -
 .../controlflow/BasicBlocks.expected          |  4 ---
 .../library-tests/controlflow/Cfg.expected    | 20 +++------------
 .../type-inference/type-inference.expected    | 25 +++++++++++++++++++
 rust/ql/test/rust-toolchain.toml              |  2 +-
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/rust/extractor/src/nightly-toolchain/rust-toolchain.toml b/rust/extractor/src/nightly-toolchain/rust-toolchain.toml
index 4e2d228630ef..7ed21df91218 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-2026-01-22"
+channel = "nightly-2025-06-01"
 components = [ "rust-src" ]
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/library-tests/controlflow/BasicBlocks.expected b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
index 80357ae29f86..94760d6875e1 100644
--- a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
+++ b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
@@ -743,7 +743,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 +750,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 |
@@ -1424,7 +1422,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 +1432,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 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index ef97a3b628f7..25fb8f29e04c 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1288,20 +1288,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 |  |
@@ -1324,11 +1317,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/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index 1b750fab4586..a2322cdf9292 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -788,12 +788,14 @@ inferCertainType
 | 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 | 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(...) | A | {EXTERNAL LOCATION} | Global |
 | 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 |
@@ -804,6 +806,7 @@ inferCertainType
 | 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 | 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 |
@@ -813,6 +816,7 @@ inferCertainType
 | 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 | 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 |
@@ -3350,16 +3354,20 @@ inferCertainType
 | main.rs:2345:13:2346:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2345:29:2346:13 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2349:17:2349:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2349:17:2349:20 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:17:2349:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2349:24:2349:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2349:24:2349:55 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:24:2349:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2350:9:2350:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2350:9:2350:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2350:9:2350:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2350:24:2350:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2350:24:2350:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2350:33:2350:37 | "one" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2350:33:2350:37 | "one" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2351:9:2351:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2351:9:2351:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2351:9:2351:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2351:24:2351:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2351:24:2351:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
@@ -3367,21 +3375,25 @@ inferCertainType
 | main.rs:2351:33:2351:37 | "two" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2352:9:2352:33 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2352:20:2352:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2352:20:2352:23 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2352:20:2352:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2352:32:2352:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2353:9:2353:37 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2353:22:2353:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2353:22:2353:25 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2353:22:2353:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2353:36:2353:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2354:9:2354:42 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2354:13:2354:24 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2354:29:2354:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2354:29:2354:32 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2354:29:2354:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2354:41:2354:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2355:9:2355:36 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2355:13:2355:24 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2355:29:2355:33 | &map1 |  | {EXTERNAL LOCATION} | & |
 | main.rs:2355:30:2355:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2355:30:2355:33 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2355:30:2355:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2355:35:2355:36 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2359:17:2359:17 | a |  | {EXTERNAL LOCATION} | i64 |
@@ -6452,12 +6464,14 @@ 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(...) | A | {EXTERNAL LOCATION} | Global |
 | 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 |
@@ -6483,6 +6497,7 @@ inferType
 | 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 |
@@ -6508,6 +6523,7 @@ inferType
 | 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 |
@@ -11262,6 +11278,7 @@ inferType
 | main.rs:2345:13:2346:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2345:29:2346:13 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2349:17:2349:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2349:17:2349:20 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:17:2349:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2349:17:2349:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2349:17:2349:20 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11269,6 +11286,7 @@ inferType
 | main.rs:2349:17:2349:20 | map1 | V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2349:17:2349:20 | map1 | V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2349:24:2349:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2349:24:2349:55 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:24:2349:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2349:24:2349:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2349:24:2349:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
@@ -11276,6 +11294,7 @@ inferType
 | main.rs:2349:24:2349:55 | ...::new(...) | V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2349:24:2349:55 | ...::new(...) | V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2350:9:2350:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2350:9:2350:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2350:9:2350:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2350:9:2350:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2350:9:2350:12 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11295,6 +11314,7 @@ inferType
 | main.rs:2350:33:2350:37 | "one" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2350:33:2350:37 | "one" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2351:9:2351:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2351:9:2351:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2351:9:2351:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2351:9:2351:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2351:9:2351:12 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11317,6 +11337,7 @@ inferType
 | main.rs:2352:13:2352:15 | key |  | {EXTERNAL LOCATION} | & |
 | main.rs:2352:13:2352:15 | key | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2352:20:2352:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2352:20:2352:23 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2352:20:2352:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2352:20:2352:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2352:20:2352:23 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11337,6 +11358,7 @@ inferType
 | main.rs:2353:13:2353:17 | value | TRef.T | {EXTERNAL LOCATION} | & |
 | main.rs:2353:13:2353:17 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2353:22:2353:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2353:22:2353:25 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2353:22:2353:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2353:22:2353:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2353:22:2353:25 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11367,6 +11389,7 @@ inferType
 | main.rs:2354:19:2354:23 | value | TRef.T | {EXTERNAL LOCATION} | & |
 | main.rs:2354:19:2354:23 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2354:29:2354:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2354:29:2354:32 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2354:29:2354:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2354:29:2354:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2354:29:2354:32 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11398,6 +11421,7 @@ inferType
 | main.rs:2355:19:2355:23 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2355:29:2355:33 | &map1 |  | {EXTERNAL LOCATION} | & |
 | main.rs:2355:29:2355:33 | &map1 | TRef | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2355:29:2355:33 | &map1 | TRef.A | {EXTERNAL LOCATION} | Global |
 | main.rs:2355:29:2355:33 | &map1 | TRef.K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2355:29:2355:33 | &map1 | TRef.S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2355:29:2355:33 | &map1 | TRef.V | {EXTERNAL LOCATION} | Box |
@@ -11405,6 +11429,7 @@ inferType
 | main.rs:2355:29:2355:33 | &map1 | TRef.V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2355:29:2355:33 | &map1 | TRef.V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2355:30:2355:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2355:30:2355:33 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2355:30:2355:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2355:30:2355:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2355:30:2355:33 | map1 | V | {EXTERNAL LOCATION} | Box |
diff --git a/rust/ql/test/rust-toolchain.toml b/rust/ql/test/rust-toolchain.toml
index 15f54ec6b429..9343bef27c61 100644
--- a/rust/ql/test/rust-toolchain.toml
+++ b/rust/ql/test/rust-toolchain.toml
@@ -2,6 +2,6 @@
 # IMPORTANT: this can also have an impact on QL test results
 
 [toolchain]
-channel = "1.93"
+channel = "1.90"
 profile = "minimal"
 components = [ "rust-src" ]

From e11363280a7a1162825da7f8e1d78dcbfce353bb Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@github.com>
Date: Wed, 18 Feb 2026 16:56:28 +0100
Subject: [PATCH 3/3] Rust: accept test changes

---
 .../NeverTypeRepr/NeverTypeRepr.expected      |  1 +
 .../controlflow/BasicBlocks.expected          |  4 +++
 .../library-tests/controlflow/Cfg.expected    | 20 ++++++++++++---
 .../type-inference/type-inference.expected    | 25 -------------------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
index c02b6c823544..7e8d7f8718b1 100644
--- a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
@@ -1 +1,2 @@
 | gen_never_type_repr.rs:7:17:7:17 | ! |
+| gen_never_type_repr.rs:7:21:7:26 | ! |
diff --git a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
index 94760d6875e1..80357ae29f86 100644
--- a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
+++ b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
@@ -743,6 +743,7 @@ 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)] ! ... |
@@ -750,6 +751,7 @@ 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 |
@@ -1422,6 +1424,7 @@ 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 |
@@ -1432,6 +1435,7 @@ 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 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 25fb8f29e04c..ef97a3b628f7 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1288,13 +1288,20 @@ 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 | ExprStmt | test.rs:533:13:533:19 | ...::panic |  |
+| 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 | 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 |  |
@@ -1317,6 +1324,11 @@ 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/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index a2322cdf9292..1b750fab4586 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -788,14 +788,12 @@ inferCertainType
 | 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 | 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(...) | A | {EXTERNAL LOCATION} | Global |
 | 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 |
@@ -806,7 +804,6 @@ inferCertainType
 | 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 | 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 |
@@ -816,7 +813,6 @@ inferCertainType
 | 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 | 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 |
@@ -3354,20 +3350,16 @@ inferCertainType
 | main.rs:2345:13:2346:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2345:29:2346:13 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2349:17:2349:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2349:17:2349:20 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:17:2349:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2349:24:2349:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2349:24:2349:55 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:24:2349:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2350:9:2350:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2350:9:2350:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2350:9:2350:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2350:24:2350:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2350:24:2350:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2350:33:2350:37 | "one" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2350:33:2350:37 | "one" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2351:9:2351:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2351:9:2351:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2351:9:2351:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2351:24:2351:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
 | main.rs:2351:24:2351:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
@@ -3375,25 +3367,21 @@ inferCertainType
 | main.rs:2351:33:2351:37 | "two" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2352:9:2352:33 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2352:20:2352:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2352:20:2352:23 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2352:20:2352:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2352:32:2352:33 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2353:9:2353:37 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2353:22:2353:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2353:22:2353:25 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2353:22:2353:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2353:36:2353:37 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2354:9:2354:42 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2354:13:2354:24 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2354:29:2354:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2354:29:2354:32 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2354:29:2354:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2354:41:2354:42 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2355:9:2355:36 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2355:13:2355:24 | TuplePat |  | {EXTERNAL LOCATION} | (T_2) |
 | main.rs:2355:29:2355:33 | &map1 |  | {EXTERNAL LOCATION} | & |
 | main.rs:2355:30:2355:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2355:30:2355:33 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2355:30:2355:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2355:35:2355:36 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2359:17:2359:17 | a |  | {EXTERNAL LOCATION} | i64 |
@@ -6464,14 +6452,12 @@ 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(...) | A | {EXTERNAL LOCATION} | Global |
 | 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 |
@@ -6497,7 +6483,6 @@ inferType
 | 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 |
@@ -6523,7 +6508,6 @@ inferType
 | 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 |
@@ -11278,7 +11262,6 @@ inferType
 | main.rs:2345:13:2346:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2345:29:2346:13 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2349:17:2349:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2349:17:2349:20 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:17:2349:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2349:17:2349:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2349:17:2349:20 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11286,7 +11269,6 @@ inferType
 | main.rs:2349:17:2349:20 | map1 | V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2349:17:2349:20 | map1 | V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2349:24:2349:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2349:24:2349:55 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2349:24:2349:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2349:24:2349:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2349:24:2349:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
@@ -11294,7 +11276,6 @@ inferType
 | main.rs:2349:24:2349:55 | ...::new(...) | V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2349:24:2349:55 | ...::new(...) | V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2350:9:2350:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2350:9:2350:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2350:9:2350:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2350:9:2350:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2350:9:2350:12 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11314,7 +11295,6 @@ inferType
 | main.rs:2350:33:2350:37 | "one" |  | {EXTERNAL LOCATION} | & |
 | main.rs:2350:33:2350:37 | "one" | TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2351:9:2351:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2351:9:2351:12 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2351:9:2351:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2351:9:2351:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2351:9:2351:12 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11337,7 +11317,6 @@ inferType
 | main.rs:2352:13:2352:15 | key |  | {EXTERNAL LOCATION} | & |
 | main.rs:2352:13:2352:15 | key | TRef | {EXTERNAL LOCATION} | i32 |
 | main.rs:2352:20:2352:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2352:20:2352:23 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2352:20:2352:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2352:20:2352:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2352:20:2352:23 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11358,7 +11337,6 @@ inferType
 | main.rs:2353:13:2353:17 | value | TRef.T | {EXTERNAL LOCATION} | & |
 | main.rs:2353:13:2353:17 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2353:22:2353:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2353:22:2353:25 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2353:22:2353:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2353:22:2353:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2353:22:2353:25 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11389,7 +11367,6 @@ inferType
 | main.rs:2354:19:2354:23 | value | TRef.T | {EXTERNAL LOCATION} | & |
 | main.rs:2354:19:2354:23 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2354:29:2354:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2354:29:2354:32 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2354:29:2354:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2354:29:2354:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2354:29:2354:32 | map1 | V | {EXTERNAL LOCATION} | Box |
@@ -11421,7 +11398,6 @@ inferType
 | main.rs:2355:19:2355:23 | value | TRef.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2355:29:2355:33 | &map1 |  | {EXTERNAL LOCATION} | & |
 | main.rs:2355:29:2355:33 | &map1 | TRef | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2355:29:2355:33 | &map1 | TRef.A | {EXTERNAL LOCATION} | Global |
 | main.rs:2355:29:2355:33 | &map1 | TRef.K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2355:29:2355:33 | &map1 | TRef.S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2355:29:2355:33 | &map1 | TRef.V | {EXTERNAL LOCATION} | Box |
@@ -11429,7 +11405,6 @@ inferType
 | main.rs:2355:29:2355:33 | &map1 | TRef.V.T | {EXTERNAL LOCATION} | & |
 | main.rs:2355:29:2355:33 | &map1 | TRef.V.T.TRef | {EXTERNAL LOCATION} | str |
 | main.rs:2355:30:2355:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2355:30:2355:33 | map1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2355:30:2355:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
 | main.rs:2355:30:2355:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
 | main.rs:2355:30:2355:33 | map1 | V | {EXTERNAL LOCATION} | Box |