Rust: upgrade to rust-analyzer 0.0.300 #20055

redsun82 · 2025-07-15T13:02:05Z

The upgrade script is particularly complex. To test it out, I have:

compiled the extractor on main
run the ForTypeRepr, WherePred and TypeBound tests. The only change I observed were locations (for ForBinder instances reconstructed with the upgrade script, the location does not include the for keyword).

rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql

+  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
+}
+
+query predicate getCrateOrigin(AsmExpr x, string getCrateOrigin) {


rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql

rust/ql/lib/codeql/rust/elements.qll

 import codeql.rust.elements.FieldExpr
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.FnPtrTypeRepr
+import codeql.rust.elements.ForBinder


rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql

@@ -4,6 +4,20 @@

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

+query predicate getExtendedCanonicalPath(AsmExpr x, string getExtendedCanonicalPath) {


rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql

+  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
+}
+
+query predicate getCrateOrigin(AsmExpr x, string getCrateOrigin) {


rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql

+  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
+}
+
+query predicate getAttributeMacroExpansion(AsmExpr x, MacroItems getAttributeMacroExpansion) {


rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql

@@ -37,8 +37,8 @@
  toBeTested(x) and not x.isUnknown() and getBody = x.getBody()
 }

-query predicate getClosureBinder(ClosureExpr x, ClosureBinder getClosureBinder) {
-  toBeTested(x) and not x.isUnknown() and getClosureBinder = x.getClosureBinder()
+query predicate getForBinder(ClosureExpr x, ForBinder getForBinder) {


rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql

+
+query predicate instances(ForBinder x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getGenericParamList(ForBinder x, GenericParamList getGenericParamList) {


rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql

@@ -4,8 +4,8 @@

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

-query predicate getGenericParamList(ForTypeRepr x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+query predicate getForBinder(ForTypeRepr x, ForBinder getForBinder) {


rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql

@@ -13,6 +13,10 @@
  if x.isConst() then isConst = "yes" else isConst = "no"
 }

+query predicate getForBinder(TypeBound x, ForBinder getForBinder) {


rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql

@@ -4,8 +4,8 @@

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

-query predicate getGenericParamList(WherePred x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+query predicate getForBinder(WherePred x, ForBinder getForBinder) {


Copilot

Pull Request Overview

This PR upgrades the rust-analyzer version from 0.0.299 to 0.0.300 as indicated by the title. The upgrade brings updates to the Rust AST schema and affects test expectations across various CodeQL test suites due to improved location precision and renamed AST nodes.

Updates the Rust AST schema with structural changes including renaming ClosureBinder to ForBinder
Introduces the ForBinder as a more general construct for closure and type parameter bindings
Updates dependency versions and test expectations to match the improved rust-analyzer output

Reviewed Changes

Copilot reviewed 204 out of 251 changed files in this pull request and generated no comments.

File	Description
shared/tree-sitter-extractor/Cargo.toml	Updates the `rand` dependency from version 0.9.1 to 0.9.2
rust/schema/ast.py	Major AST schema changes: renames `ClosureBinder` to `ForBinder`, adds `Item` inheritance to `AsmExpr`, and updates field references
rust/schema/annotations.py	Updates documentation and annotations to reflect the renaming from `ClosureBinder` to `ForBinder`
Multiple .expected files	Updates test expectations to reflect improved location precision from the rust-analyzer upgrade

_{You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.}

aibaars · 2025-08-18T16:07:08Z

rust/ql/test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.expected

@@ -1 +1,2 @@
 | gen_asm_clobber_abi.rs:8:14:8:29 | AsmClobberAbi |
+| gen_asm_clobber_abi.rs:8:14:8:29 | AsmClobberAbi |


This looks like a duplicate database element. Any idea what this is about?

I think it has to do with how the asm! macro is expanded. Might be good to have a look at the AST

seems like asm! expands to a MacroBlockExpr that has both its TailExpr and its Statement populated with a copy of the AsmExpr each 😕

That sounds like a potential bug. The parser is implemented by hand, so it is possible they made a mistake.

well, it's not the parser populating that, but the asm! special case of macro expansion (so even more ripe for possible errors)

Or more likely the tail_expr() and statements() methods are wrong. These are typically implemented as "find first child with matching type" and because AsmExpr is now also an Item the statements() method will pick it up too. See also:

https://github.com/rust-lang/rust-analyzer/blob/58bbdec73138b978dd91f1082110168fcdeb4669/crates/syntax/src/ast/generated/nodes.rs#L1561-L1565

https://github.com/rust-lang/rust-analyzer/blob/58bbdec73138b978dd91f1082110168fcdeb4669/crates/syntax/src/ast/generated/nodes.rs#L949-L954

Not sure if you want to file a bug report, a PR to fix it, or whether to patch things up in the extractor or in QL.

Having duplicated nodes is not great, but asm stuff is fairly rare and we don't do much with it so having a bad AST temporarily shouldn't be too much of a problem.

uh, I think I see what's happening. This is equivalent to that weird situation we have for path segments, where there's a roundabout way of getting the types from it.

When asking for the repeated Stmt children of a MacroBlock, the library just looks at the children for a matching type. Now, because AsmExpr now are also Items, and Items are Stmts, an AsmExpr will match both as the Stmt* children and as the Expr? one. So this stems from a limitation of the ast library in rust-analyzer...

:jinx-coke:

can fix that in the extractor

filed an issue in rust-lang/rust-analyzer#20485

rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs

rust/schema/ast.py

redsun82 added 4 commits July 15, 2025 14:14

Cargo: upgrade dependencies

f0466ae

Bazel: regenerate cargo vendored files

7b48cb2

Rust: run codegen again

c5afc65

Bazel: bump rust toolchain version to 1.88

e79938b

github-actions bot added the Rust Pull requests that update Rust code label Jul 15, 2025

github-advanced-security bot found potential problems Jul 15, 2025

View reviewed changes

redsun82 added 2 commits July 15, 2025 17:25

Merge branch 'main' into redsun82/cargo-upgrade-2

fd8ab05

Merge branch 'main' into redsun82/cargo-upgrade-2

2765026

redsun82 added the depends on internal PR This PR should only be merged in sync with an internal Semmle PR label Aug 5, 2025

redsun82 changed the title ~~Rust: upgrade to rust 1.88 and rust-analyzer 0.0.294~~ Rust: upgrade to rust-analyzer 0.0.294 Aug 12, 2025

redsun82 added 6 commits August 12, 2025 16:42

Merge branch 'main' into redsun82/cargo-upgrade-2

a007230

Cargo: upgrade dependencies

6ad8af0

Bazel: regenerate vendored cargo dependencies

0a42b7a

Rust: run codegen again

338572f

Rust: fix compilation errors

fbc81cb

Rust: add ForBinder case in ClosureExpr and accept test changes

92e9469

github-actions bot added the Ruby label Aug 12, 2025

redsun82 changed the title ~~Rust: upgrade to rust-analyzer 0.0.294~~ Rust: upgrade to rust-analyzer 0.0.300 Aug 12, 2025

github-advanced-security bot found potential problems Aug 12, 2025

View reviewed changes

Merge branch 'main' into redsun82/cargo-upgrade-2

6ca1c58

github-advanced-security bot found potential problems Aug 14, 2025

View reviewed changes

redsun82 removed the depends on internal PR This PR should only be merged in sync with an internal Semmle PR label Aug 15, 2025

redsun82 added 2 commits August 15, 2025 10:12

Rust: accept test changes

0924d79

Merge branch 'main' into redsun82/cargo-upgrade-2

71edc48

redsun82 mentioned this pull request Aug 15, 2025

Rust: upgrade rust-analyzer to 0.0.289 #19930

Closed

redsun82 marked this pull request as ready for review August 15, 2025 08:20

redsun82 requested review from a team as code owners August 15, 2025 08:20

Copilot AI review requested due to automatic review settings August 15, 2025 08:20

Copilot AI reviewed Aug 15, 2025

View reviewed changes

redsun82 added 6 commits August 18, 2025 09:21

Merge branch 'main' into redsun82/cargo-upgrade-2

7a95d5a

Rust: add upgrade script

a867145

Rust: accept test changes

4df4794

Merge branch 'main' into redsun82/cargo-upgrade-2

3d2bd8f

Rust: add downgrade script

6266d6e

Rust: refine upgrade script

a658fa1

aibaars reviewed Aug 18, 2025

View reviewed changes

redsun82 added the no-change-note-required This PR does not need a change note label Aug 18, 2025

redsun82 added 7 commits August 19, 2025 12:25

Merge branch 'main' into redsun82/cargo-upgrade-2

ce48202

Fix ForTypeRepr docs and test with proper instance

d38459a

Rust: fix duplicate asm! expressions

49bf48e

Rust: adapt upgrade/downgrade scripts to new hash

8ed277d

Rust: accept test changes

680b4ab

Merge branch 'main' into redsun82/cargo-upgrade-2

5e0f0c0

Rust: fix old.dbscheme in downgrade script

fbeebd7

redsun82 requested a review from aibaars August 19, 2025 12:39

redsun82 mentioned this pull request Aug 19, 2025

Rust-analyzer as library: potential overlap between expr()/tail_expr() and statements() in ast::MacroStmts and ast::StmtList rust-lang/rust-analyzer#20485

Open

		@@ -4,6 +4,20 @@

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

		query predicate getExtendedCanonicalPath(AsmExpr x, string getExtendedCanonicalPath) {


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

		query predicate getGenericParamList(ForBinder x, GenericParamList getGenericParamList) {

		@@ -1 +1,2 @@
		\| gen_asm_clobber_abi.rs:8:14:8:29 \| AsmClobberAbi \|
		\| gen_asm_clobber_abi.rs:8:14:8:29 \| AsmClobberAbi \|

Rust: upgrade to rust-analyzer 0.0.300 #20055

Are you sure you want to change the base?

Rust: upgrade to rust-analyzer 0.0.300 #20055

Uh oh!

Conversation

redsun82 commented Jul 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Check warning

Uh oh!

Check warning

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aibaars Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

redsun82 Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

redsun82 commented Jul 15, 2025 •

edited

Loading

aibaars Aug 19, 2025 •

edited

Loading

redsun82 Aug 19, 2025 •

edited

Loading