Rust: Update rust-analyzer - #22661
Merged
Merged
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| import codeql.files.FileSystem | ||
| import codeql.rust.elements.Abi | ||
| import codeql.rust.elements.Addressable | ||
| import codeql.rust.elements.AnyAttr |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
paldepind
force-pushed
the
rust/update-rust-analyzer-sep-23
branch
from
September 25, 2026 07:49
e417c3b to
3a7f851
Compare
Contributor
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
paldepind
force-pushed
the
rust/update-rust-analyzer-sep-23
branch
3 times, most recently
from
September 25, 2026 12:05
7ab640b to
7321f99
Compare
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 612c2b22-3121-4c83-9656-bb0f4abb2a8a
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: a04d83d9-ceea-4109-8ce1-f420585125d4
ra-ap-rustc_lexer requires unicode-ident and unicode-properties to use matching Unicode tables. ra_ap_parser 0.0.352 also requires winnow 0.7.13 to avoid a panic on Unicode following incomplete frontmatter. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 612c2b22-3121-4c83-9656-bb0f4abb2a8a
paldepind
force-pushed
the
rust/update-rust-analyzer-sep-23
branch
from
September 25, 2026 12:12
7321f99 to
c329d70
Compare
The new rust-analyzer version fixed a bug related to unicode parsing. As at test for this, one of the `ra_ap_parser` crate contain a test fixture with this invalid unicode. The _current_ Rust extractor naturally inherits the parsing bug present in the older rust-analyzer dependency that it uses. When CI does Code Scanning on the _new_ Rust extractor with the _old_ Rust extractor the parsing bug is hit since the beforementioned test fixture is extracted when extracting the Rust extractor through the `ra_ap_parser` dependency. As a temporaty workaroyund, we remove the test fixture from Cargo's downloaded dependency source before extracting. This avoid the old extractor failing in CI. Once the updated extractor is running on CI we should be able to remove this again.
Regenerate line-count expectations now that documentation comments are extracted as grammar nodes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 612c2b22-3121-4c83-9656-bb0f4abb2a8a
paldepind
force-pushed
the
rust/update-rust-analyzer-sep-23
branch
from
September 25, 2026 12:33
c329d70 to
ffc6ca4
Compare
paldepind
marked this pull request as ready for review
September 28, 2026 07:09
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
DocComment loses queryable text, and the declared full downgrade drops documentation comments rather than restoring legacy comment facts.
Review effort: Balanced
Findings: 1
Open (2)
What changed in this PR
Updates the Rust extractor to rust-analyzer 0.0.352 and adapts extraction to the new AnyAttr and DocComment AST nodes.
Changes:
- Updates Rust tooling, dependencies, and generated Bazel metadata.
- Regenerates schemas, QL libraries, and extractor tests for
AnyAttr. - Adds migration metadata, diagnostics updates, and CI handling.
| File | Description |
|---|---|
.github/workflows/rust-analysis.yml |
Removes a malformed dependency fixture before analysis. |
Cargo.lock, MODULE.bazel, Cargo manifests |
Update Rust and transitive dependencies. |
misc/bazel/3rdparty/tree_sitter_extractors_deps/** |
Regenerate vendored Bazel dependency metadata. |
rust/ast-generator/** |
Generate AnyAttr extraction via attrs_with_doc. |
rust/extractor/** |
Update toolchain and generated extraction code. |
rust/schema/** |
Model AnyAttr and DocComment. |
rust/ql/lib/codeql/rust/** |
Expose the new AST hierarchy throughout QL. |
rust/ql/lib/upgrades/**, rust/downgrades/** |
Add schema migration metadata. |
rust/ql/test/** |
Regenerate extractor and diagnostic expectations. |
rust/ql/integration-tests/conftest.py, rust/ql/test/setup.sh |
Install Rust 1.98.1 for tests. |
rust/ql/lib/change-notes/** |
Document the rust-analyzer upgrade. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| fn get_trait_fields(trait_name: &str) -> Vec<FieldInfo> { | ||
| match trait_name { | ||
| "HasAttrs" => vec![FieldInfo::list("attrs", "Attr")], | ||
| "HasAttrs" => vec![FieldInfo::list("attrs", "AnyAttr")], |
| description: Downgrade rust-analyzer to 0.0.347 | ||
| compatibility: full | ||
|
|
||
| doc_comments.rel: delete |
Contributor
There was a problem hiding this comment.
Fair, but not sure it is worthwhile fixing.
hvitved
reviewed
Sep 29, 2026
| languages: ${{ matrix.language }} | ||
| config-file: ./.github/codeql/codeql-config.yml | ||
|
|
||
| - name: Remove malformed rust-analyzer parser fixture |
Contributor
There was a problem hiding this comment.
Perhaps add a TODO comment about removing this again.
Contributor
Author
There was a problem hiding this comment.
Done and I've added an issue so I don't forget 💪
| @@ -1 +1 @@ | |||
| | 60 | | |||
| | 67 | | |||
Contributor
There was a problem hiding this comment.
I think it would be better to update File.getNumberOfLinesOfCode to also exclude DocComments.
Contributor
Author
There was a problem hiding this comment.
Good point. That might actually be why we extract more lines of code in DCA 🫠
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e18ced25-1ee7-4f49-8f95-38272775c944
hvitved
approved these changes
Sep 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR updates rust-analyzer for the Rust extractor to version 0.0.352.
The biggest change that affects is is a recent change to
rust.ungramthat introduces a new AST nodeas well as
DocComment. Pretty much everywhere whereAttrwhere previously used the grammar now specifiesAnyAttr. This change is reflected in the dbscheme, QL classes, etc.DCA
The DCA report is fine. "Lines of code in the database" seems to genuinely have improved by a significant amount. For "Missing call targets" a lot of projects have exactly 12 additional missing targets, but "Calls with a call target" only increases, so this is likely because we're extracting something we didn't extract before (maybe something in a common library).