Rust: Force stable toolchain by paldepind · Pull Request #22493 · github/codeql

paldepind · 2026-09-02T11:52:57Z

Experiment to see the effect on DCA.

Update hand-written library predicates for the 0.0.347 AST changes: - FormatArgsArg.getArgName() -> getName() (the arg name is now a Name, carrying text, instead of the text-less FormatArgsArgName placeholder). - Visibility.getPath()/hasPath() -> getVisibilityInner().getPath(); the path now hangs off an intermediate VisibilityInner node. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

The ra_ap 0.0.347 builtin format_args! expander needs a newer std than 0.0.328, so the QL test toolchain is bumped to 1.97 (matching the root dev toolchain). Generated extractor-test expectations are regenerated for the new schema fields (asm attrs, Trait impl_restriction, Struct/TupleField mut_restriction, Visibility visibility_inner, FormatArgsArg name) and for the std sysroot dependency churn that comes with the newer toolchain. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

The schema delta for ra_ap 0.0.347 adds the new node kinds DerefPat, ImplRestriction, IncludeBytesExpr, MutRestriction, NotNull, PatternTypeRepr and VisibilityInner, moves a Visibility path onto the new VisibilityInner, replaces the text-less FormatArgsArgName placeholder with a Name, and adds attrs to the inline assembly nodes, mut_restriction to Struct/TupleField and impl_restriction to Trait. The upgrade repurposes the old format-arg placeholder ids as Name ids (avoiding dangling refs) and synthesises a VisibilityInner per visibility with a path. The downgrade rejoins the visibility path, repurposes ids back to the placeholder, and scrubs the locations of the deleted node kinds. compatibility is partial: the new node kinds are empty on old DBs, so a rebuild yields strictly-better results while existing queries keep working. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Regenerate the Rust translator so codegen emits the current Translator<'_> impl signature. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Rust 1.97 reports redundant formatting borrows and map iteration warnings under -D warnings. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

A full new->old->new dataset upgrade/downgrade round-trip surfaced dangling references: deleting the new node kinds left `macro_call_macro_call_expansions` rows (and potentially `comments` rows) pointing at now-undefined `@ast_node`s. These are the only two relations with a generic `@ast_node`-typed value column, so the downgrade now drops rows in both that reference a deleted node, alongside the existing `locatable_locations` scrub. `codeql dataset check` is now clean at every stage of the round-trip. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

The template emitted `impl Translator<'_>` (one lifetime) while `base.rs` declares `Translator<'a, 'db>`, so regenerating produced a `generated.rs` that did not compile. Update the template to two lifetimes and regenerate. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

The `rules_rust` 0.69 -> 0.73 bump changes the vendored file format and repo layout, invalidating the previously vendored files. Regenerate them all via the umbrella `update_cargo_deps.sh` (py_deps + tree_sitter_extractors_deps). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

`rules_rust` 0.73 vendors crates as subpackages of a single `@vendor_ts` repo (a per-crate alias) rather than one repo per crate. `rust.ungram` is only exported from the crate's own vendored repo, so derive that repo from the crate label instead of assuming the crate sits at a repo root. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Add QLDoc annotations for the AST nodes introduced by ra_ap 0.0.347 (`DerefPat`, `ImplRestriction`, `IncludeBytesExpr`, `MutRestriction`, `NotNull`, `PatternTypeRepr`, `VisibilityInner`). `DerefPat`, `IncludeBytesExpr` and `NotNull` keep `cfg=True` so annotating them does not drop their CFG nodes. The example snippets double as generated extractor tests. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

…ernTypeRepr` These nodes represent experimental, mostly compiler-internal Rust features that cannot be written directly in stable Rust. The docs now say so and note that the examples use rust-analyzer's canonical `builtin#` syntax. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

The new nightly toolchain rejects let-chains in edition 2021 and enables deny-by-default lints (e.g. `dangerous_implicit_autorefs`) that fail extraction of valid test sources. Add a `qltest_edition` option so individual tests can opt into a newer edition, and pass `--cap-lints=allow` to the qltest cargo check. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Use edition 2024 for the let-chain fixtures (`dataflow/local`, `variables`, `unusedentities`). Drop stale `MISSING` markers in `type-inference` where the new inference now resolves the types, and mark the `System` `alloc`/`alloc_zeroed`/`realloc` alerts in CWE-770 as `MISSING` since rust-analyzer 0.0.347 no longer resolves those `GlobalAlloc` sinks. The regression is called out with inline comments in the fixture. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Resolve MODULE.bazel conflict: keep `rules_rust` 0.73.0 (this branch) and `rules_swift` 4.0.0-rc5-codeql.1 plus the `apple_support` removal (main). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

1.96 turned `use SomeStruct::{self};` into a hard error (E0432), which broke the path-resolution test. 1.95 is the newest stable that still accepts it while also expanding the builtin `format_args!` macro against std. Re-accept the std-snapshot and format-arg/panic expansion changes that follow from the ra_ap 0.0.347 upgrade at this toolchain. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

The new `DerefPat` node from ra_ap 0.0.347 had no case in the pattern CFG builder, leaving the enclosing function's CFG disconnected and tripping `CfgConsistency` (a `deadEnd`). Wire it like `BoxPat`, since it wraps a single inner pattern via `getPat()`. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

`rust-analyzer` 0.0.347 no longer expands the format-family macros (`format!`, `println!`, `write!`, `panic!`, ...) against a pre-1.94 std, so flow through them and the security-query sinks keyed on their callees were lost. Rebuild each macro's real expansion (a `FormatArgsExpr` wrapped in its callee) from the argument tokens so both keep working. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7492ff50-9c8e-47ef-a70d-f2623b702c8f

…very Rust: reconstruct format-macro expansions on pre-1.94 toolchains

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Regenerate CWE-770 UncontrolledAllocationSize.expected against the merged dataflow library (alert source/sink nodes relabelled upstream); inline expectations unchanged. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

…r-update

The `System.alloc`/`alloc_zeroed`/`realloc` sinks stopped matching because the standard library made `GlobalAlloc` a legacy trait blanket-implemented for `GlobalAllocator` types. These calls now resolve to the blanket-impl methods, which have no canonical path, so the `GlobalAlloc::*` sink models miss them. This is a QL/model matching gap, not a rust-analyzer resolution failure.

… for summaries

… models

Co-authored-by: Asger F <asgerf@github.com>

…uments

github-actions · 2026-09-03T08:01:17Z

QHelp previews:

+            catch (Exception exc)
+            {
+                logger.LogWarning($"Failed to get directory of '{path}': {exc}");
+            }


+                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;
+                }


@@ -7,3 +7,7 @@
 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, Attr getAttr) {


@@ -8,6 +8,10 @@
  toBeTested(x) and not x.isUnknown() and getAsmOperand = x.getAsmOperand()
 }

+query predicate getAttr(AsmOperandNamed x, int index, Attr getAttr) {


@@ -3,3 +3,7 @@
 import TestUtils

 query predicate instances(AsmClobberAbi x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getAttr(AsmClobberAbi x, int index, Attr getAttr) {


 private import codeql.rust.elements.Locatable
 private import codeql.rust.elements.FormatArgsExpr
 private import codeql.rust.elements.FormatArgsArg
-private import codeql.rust.elements.FormatArgsArgName
+private import codeql.rust.elements.Name


+ */
+
+private import internal.VisibilityInnerImpl
+import codeql.rust.elements.AstNode


@@ -17,6 +17,10 @@
  toBeTested(x) and not x.isUnknown() and getDefaultVal = x.getDefaultVal()
 }

+query predicate getMutRestriction(StructField x, MutRestriction getMutRestriction) {


+  toBeTested(x) and not x.isUnknown() and getPat = x.getPat()
+}
+
+query predicate getTypeRepr(PatternTypeRepr x, TypeRepr getTypeRepr) {


+
+query predicate instances(PatternTypeRepr x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getPat(PatternTypeRepr x, Pat getPat) {


 query predicate getExpr(FormatArgsArg x, Expr getExpr) {
  toBeTested(x) and not x.isUnknown() and getExpr = x.getExpr()
 }
+
+query predicate getName(FormatArgsArg x, Name getName) {


+
+query predicate instances(DerefPat x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getPat(DerefPat x, Pat getPat) {


redsun82 and others added 30 commits August 14, 2026 09:21

Cargo: upgrade dependencies

dabb678

Bazel: regenerate vendored cargo dependencies

93fd01d

Rust: run codegen

1ffe300

Rust: update toolchain to nightly/2026-07-15 and rules_rust 0.73.0

bd980d2

Rust: adapt extractor to ra_ap 0.0.347 API

48718e5

Rust: document full re-vendoring after toolchain or rules_rust bump

4f6ea2a

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Merge pull request #22350 from github/redsun82-format-macro-flow-reco…

081d762

…very Rust: reconstruct format-macro expansions on pre-1.94 toolchains

Rust: rustfmt extractor sources

ef41c1c

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Update Rust log injection expected

e51dc86

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 890cb55d-0437-4bd7-9268-87b8897ada01

Merge remote-tracking branch 'origin/main' into redsun82-rust-analyze…

6dfacd0

…r-update

Merge branch 'main' into redsun82-rust-analyzer-update

55cc092

hvitved and others added 16 commits September 3, 2026 09:42

Unified: Move extension workaround into static name binding library

e9ba7f4

Unified: Enable on Arm64

02ff376

Unified: simplify Bazel build

b578f23

Unified: fix formatting

5a40ac8

Rust: Add source/sink/barrier MaD trait tests

5147ca6

FlowSummaryImpl: Align source/sink/barrier prioriterization with that…

2cbcf7b

… for summaries

Rust: Derive source/sink/barrier MaD implementation models from trait…

4e86a8f

… models

Use HTTPS for Wikimedia query-help links

905e311

Fix synchronized query-help file

79bad8b

Ruby: Disable dynamic reordering for select predicate

38b09d3

Unified: Add control flow graph.

7f1c872

Apply suggestion from @asgerf

04cc576

Co-authored-by: Asger F <asgerf@github.com>

Unified: Make pattern a subtype of expr.

a371a6e

CFG: Rename ForeachStmt to ForEachStmt.

b3a26b5

C#: Disable dynamic reordering for Unification::Gvn::unifiableTypeArg…

e76361b

…uments

Rust: Force stable toolchain

e5f8808

paldepind force-pushed the rust/force-stable-toolchain branch from b239c1e to e5f8808 Compare September 3, 2026 08:00

github-advanced-security Bot found potential problems Sep 3, 2026

View reviewed changes

github-actions Bot added C# JS C++ documentation Java Python Go Ruby Swift DataFlow Library labels Sep 3, 2026

Navigation Menu

Uh oh!

Rust: Force stable toolchain - #22493

Rust: Force stable toolchain#22493
paldepind wants to merge 88 commits into
mainfrom
rust/force-stable-toolchain

paldepind commented Sep 2, 2026

Uh oh!

github-actions Bot commented Sep 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants


		query predicate instances(PatternTypeRepr x) { toBeTested(x) and not x.isUnknown() }

		query predicate getPat(PatternTypeRepr x, Pat getPat) {


		query predicate instances(DerefPat x) { toBeTested(x) and not x.isUnknown() }

		query predicate getPat(DerefPat x, Pat getPat) {

Uh oh!

Conversation

paldepind commented Sep 2, 2026

Uh oh!

github-actions Bot commented Sep 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants