Cargo: Enable most pedantic Clippy lints + some from `nursery` & `restriction` by paldepind · Pull Request #23095 · github/codeql

paldepind · 2026-11-11T11:10:18Z

This PR enables most lints in Clippy's pedantic group, similar to what we used to have for the C/C++ BMN setup. Compared to that I've disable a few more rules, since they provided false positives or results of dubious value.

All the lint errors have been fixed using Clippy's automatic --fix option or by Copilot. I've vetted each rule that required changes and gone through all the changes. Combined with #23053 we've now fixed 207 lint errors! Of course many of these are very tiny improvements, but almost all of them makes the code more consistent, idiomatic, performant, clear/explicit, robust, etc. So I think this is overall a really nice improvement.

I did a commit for each lint rule that was addressed. This makes it easy to see why something was changed, but make per-commit review rather tedious. The changes here are rather simple and of a if-it-still-compiles-it-still-works kind. So I think a very light review of the changes is sufficient. I've started DCA for Rust, Ruby and Unified.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Copilot

🟡 Changes recommended

Active critical build and compilation failures remain, including unresolved Bazel dependencies and an invalid String collection, along with a breaking public API change.

5 open issues

Keep lazy_static available to generated Bazel targets · New
Preserve lazy_static in the generated Bazel dependency graph · New
Collect String items with a compatible approach · New
Preserve Ast::from_tree API compatibility · New
Fix the “backtic” typo · New

What changed in this PR

This PR enables most Clippy pedantic lints across the Rust workspace, applies the resulting idiomatic refactors, and replaces direct lazy_static usage with std::sync::LazyLock.

Changes:

Enables workspace-wide Clippy pedantic lints with targeted exceptions.
Applies refactors across extractors, Yeast, generators, tests, and supporting utilities.
Updates Cargo and Bazel dependency metadata.

File	Description
unified/swift-syntax-rs/src/main.rs	Simplifies source input selection.
unified/swift-syntax-rs/src/lib.rs	Updates test string handling and lint allowances.
unified/extractor/tests/corpus_tests.rs	Simplifies environment parsing and assertions.
unified/extractor/src/languages/swift/swift.rs	Adds a lint allowance and simplifies iteration.
unified/extractor/Cargo.toml	Removes the direct `lazy_static` dependency.
shared/yeast/tests/test.rs	Simplifies helper APIs and raw string literals.
shared/yeast/src/range.rs	Adds `must_use` annotations.
shared/yeast/src/query.rs	Simplifies pattern matching and copying.
shared/yeast/src/lib.rs	Applies API, formatting, and ownership refactors.
shared/yeast/src/dump.rs	Updates documentation and lint allowances.
shared/yeast/src/captures.rs	Simplifies option handling.
shared/yeast/src/bin/node_types_yaml.rs	Simplifies input selection.
shared/yeast-schema/src/node_types_yaml.rs	Refactors field conversion and test literals.
shared/yeast-macros/src/template_parse.rs	Avoids unnecessary group moves.
shared/yeast-macros/src/lower.rs	Passes token streams by reference and adds a lint allowance.
shared/yeast-macros/src/ast.rs	Simplifies a test raw string literal.
shared/tree-sitter-extractor/tests/multiple_languages.rs	Updates renamed test fixture fields.
shared/tree-sitter-extractor/tests/integration_test.rs	Updates renamed test fixture fields.
shared/tree-sitter-extractor/tests/common/mod.rs	Renames the source archive fixture field.
shared/tree-sitter-extractor/src/trap.rs	Simplifies formatting and writes output incrementally.
shared/tree-sitter-extractor/src/options.rs	Simplifies error formatting.
shared/tree-sitter-extractor/src/node_types.rs	Refactors ownership and string construction.
shared/tree-sitter-extractor/src/generator/ql.rs	Simplifies generated output formatting.
shared/tree-sitter-extractor/src/generator/ql_gen.rs	Simplifies matching and adds lint allowances.
shared/tree-sitter-extractor/src/generator/mod.rs	Simplifies generated name construction and borrowing.
shared/tree-sitter-extractor/src/file_paths.rs	Simplifies path handling and formatting.
shared/tree-sitter-extractor/src/extractor/mod.rs	Simplifies verbosity handling and control flow.
shared/tree-sitter-extractor/src/extractor/driver.rs	Adds a lint allowance and improves path formatting.
shared/tree-sitter-extractor/src/diagnostics.rs	Simplifies string cloning and defaults.
shared/tree-sitter-extractor/Cargo.toml	Removes the direct `lazy_static` dependency.
rust/extractor/src/util.rs	Changes option comparison inputs to borrowed values.
rust/extractor/src/translate/base.rs	Makes statement-style control flow explicit.
rust/extractor/src/rust_analyzer.rs	Moves local constants near their uses.
rust/extractor/src/main.rs	Simplifies option handling and adds a lint allowance.
rust/extractor/src/diagnostics.rs	Simplifies default string construction.
rust/extractor/src/crate_graph.rs	Simplifies iterator filtering and comparison.
rust/extractor/src/configuration.rs	Adapts callers to the updated option comparator.
rust/extractor/src/config/deserialize.rs	Avoids an unnecessary string clone.
rust/extractor/src/config.rs	Simplifies the separator literal.
rust/ast-generator/src/main.rs	Simplifies grouped matches and borrowing.
rust/ast-generator/patches/rust-analyzer.patch	Applies equivalent Clippy-driven changes to the patched generator.
ruby/extractor/src/main.rs	Passes extractor options by reference.
ruby/extractor/src/extractor.rs	Replaces `lazy_static` with `LazyLock` and simplifies ownership.
ruby/extractor/Cargo.toml	Removes the direct `lazy_static` dependency.
ql/buramu/src/main.rs	Replaces `lazy_static` with `LazyLock`.
ql/buramu/Cargo.toml	Removes the direct `lazy_static` dependency.
MODULE.bazel	Updates exported Rust workspace dependencies.
misc/bazel/3rdparty/rust_workspace_deps/lazy_static/BUILD.bazel	Removes the obsolete dependency alias.
misc/bazel/3rdparty/rust_workspace_deps/lazy_static-1.5.1/BUILD.bazel	Removes the obsolete versioned alias.
misc/bazel/3rdparty/rust_workspace_deps/crates.bzl	Updates generated dependency mappings.
misc/bazel/3rdparty/rust_workspace_deps/BUILD.bazel	Removes obsolete `lazy_static` aliases.
cpp/extractor/bmn/src/package_database.rs	Improves path error formatting.
cpp/extractor/bmn/src/main.rs	Improves executable path error formatting.
cpp/extractor/bmn/src/gnu_compiler_default_include_finder.rs	Updates compiler error formatting and tests.
cpp/extractor/bmn/src/file_filter.rs	Improves path error formatting.
cpp/extractor/bmn/src/dependency_installation.rs	Improves command failure formatting.
cpp/extractor/bmn/src/compiler.rs	Improves compiler error formatting.
clippy.toml	Adds documentation identifier configuration.
Cargo.toml	Enables workspace-wide pedantic Clippy lints and exceptions.
Cargo.lock	Removes direct `lazy_static` dependency entries from workspace packages.

_{Review effort: Lite (auto)}

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

asgerf

Changes in unified LGTM

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

…ets` Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Enable additional lints. These have no results in our code but are suggested in: https://microsoft.github.io/rust-guidelines/guidelines/universal/index.html#clippy-lints

paldepind · 2026-11-13T10:22:03Z

I've enabled some more lints from the nursery and restriction group. These where suggested in https://microsoft.github.io/rust-guidelines/guidelines/universal/index.html#clippy-lints.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

tausbn

Many of these look good to me, but a bunch of them are (in my opinion) somewhat questionable.

Also, a meta-comment: perhaps in the future try to split this up so it isn't a single 56-commit PR. That way, the unobjectionable parts can be merged, while the more dubious lints can be discussed further. This was a somewhat exhausting PR to review.

tausbn · 2026-11-13T13:37:37Z

    for component in components {
        match component {
-            std::path::Component::CurDir => continue,
+            std::path::Component::CurDir => {}


I'm a bit ambivalent about this one. Yes, for the current incarnation of the code (where there's nothing following the match) the continue is indeed superfluous, but if we were to add code after the match, this would no longer be true.

That could go both ways couldn't it? We might add code after the match that should apply to all cases and in that case the {} would be what we want.

I think the change makes things clearer: the control flow here is in fact simple normal evaluation and including continue gives the indication that that's not the case.

Alright, let's keep it in.

tausbn · 2026-11-13T13:41:42Z

        match self {
-            QueryNode::Node { kind, .. } => Some(kind),
-            QueryNode::UnnamedNode { kind } => Some(kind),
+            QueryNode::Node { kind, .. } | QueryNode::UnnamedNode { kind } => Some(kind),


This is another one where I don't feel like the "improvement" outweighs the fact that it makes the code harder to read.

Now reverted and match_same_arms is disabled.

tausbn · 2026-11-13T13:43:17Z


 impl AstNode for ExtraNode {
-    fn kind(&self) -> &str {
+    fn kind(&self) -> &'static str {


I feel like the previous version was simpler. Less precise, sure, but simpler.

I like this one because the type makes it immediately clear that kind is not some dynamic thing that is constructed on the fly.

This is of course also readily apparent from the implementation, so I'm guessing the situation you have in mind is one where you're looking at some call to kind on an ExtraNode and you inspect the type to see that it's static. I think I would just be more confused by this (since kind is not in general static on AstNode itself).

To be honest, I'm maybe a 3/10 on the sliding scale, so if you prefer it, I'm fine with leaving it in. 🙂

tausbn · 2026-11-13T14:21:17Z

    // mustache is not very good at avoiding blank lines
    // adopting the workaround from https://github.com/groue/GRMustache/issues/46#issuecomment-19498046
-    s.split("\n")
+    s.split('\n')


This feels like a marginal improvement at best. "Pedantic" is the right word for this one.

Yeah, this is very minor.

tausbn · 2026-11-13T14:32:57Z

    pub root_dir: PathBuf,
    pub file_list: PathBuf,
-    pub source_archive_dir: PathBuf,
+    pub archive_dir: PathBuf,


It's not entirely clear to me why this rewrite is better. Is it because it's superfluous to have a field starting with source when the struct is called SourceArchive? In that case, shouldn't it go all the way to calling the field dir?

Yes, the lint to prevent struct where the field names repeat the struct name. But I also felt that just dir was too ambiguous >.<. Probably better to just revert this and disable the rule which I've done.

tausbn · 2026-11-13T14:38:35Z

    }
    index += 1;

-    const CODING: [char; 12] = ['C', 'c', 'O', 'o', 'D', 'd', 'I', 'i', 'N', 'n', 'G', 'g'];


Moving this ~20 lines up seems like a net loss for readability.

Yes, it doesn't help much here. But some of the other instances the rule found where pretty good. Do you think we should add an allow, accept this, or disable the rule entirely?

I think in this case, probably a better solution would be to refactor the code (so that CODING can be right next to its code in that helper function), so I say let's just keep the change as-is.

Yes, that's the best solution. I've done that in 2fa146b.

This reverts commit c522fd2.

This reverts commit 96b6fb0.

paldepind · 2026-11-13T16:10:44Z

Also, a meta-comment: perhaps in the future try to split this up so it isn't a single 56-commit PR. That way, the unobjectionable parts can be merged, while the more dubious lints can be discussed further. This was a somewhat exhausting PR to review.

You're right. I didn't expect this to be as big going in and then I just kept going. But I should've stopped and split this across some PRs. Thanks for pushing through with the review 🙏

I've disabled two of the lints and fixed the things you spotted. Let me know if there's any of the comments where you feel further lints should be undone?

tausbn

I think you've addressed all of my comments. ❤️

paldepind and others added 11 commits November 11, 2026 11:48

Enable Clippy's pedantic lints

cedfdeb

Fix all results of the Clippy lint cloned_instead_of_copied

b3552c5

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint implicit_clone

5ae3fa9

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint single_match_else

e3c310e

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint uninlined_format_args

7941191

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint map_unwrap_or

71ef28c

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint manual_string_new

fd386a1

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint needless_continue

bac4c43

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint match_same_arms

c522fd2

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint unnecessary_literal_bound

e98c562

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint elidable_lifetime_names

17db5e1

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

paldepind requested a dynamic review from Copilot November 11, 2026 11:10

Copilot started reviewing on behalf of paldepind November 11, 2026 11:11

View session

github-actions Bot added C++ Ruby QL-for-QL Rust Pull requests that update Rust code Unified labels Nov 11, 2026

Copilot AI reviewed Nov 11, 2026

View reviewed changes

Comment thread MODULE.bazel Resolved

Comment thread misc/bazel/3rdparty/rust_workspace_deps/crates.bzl Resolved

Comment thread shared/tree-sitter-extractor/src/node_types.rs Resolved

Comment thread shared/yeast/src/lib.rs Resolved

Comment thread clippy.toml Resolved

paldepind and others added 11 commits November 11, 2026 12:28

Fix all results of the Clippy lint doc_markdown

b03995f

Fix all results of the Clippy lint unnecessary_join

6b00a37

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint needless_raw_string_hashes

c287799

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint non_std_lazy_statics

52e9f50

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint manual_assert

ae96ca1

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint trivially_copy_pass_by_ref

925a390

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint flat_map_option

9e71fdb

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint ref_option

5ef41d3

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint semicolon_if_nothing_returned

3154453

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint unnecessary_semicolon

207cc35

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

Fix all results of the Clippy lint return_self_not_must_use

d1f084a

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e4429304-eb0c-4b7d-9675-11e1eabfd0b8

paldepind requested a review from a team as a code owner November 11, 2026 11:44

asgerf reviewed Nov 12, 2026

View reviewed changes

paldepind and others added 11 commits November 13, 2026 10:30

Fix all results of the Rust lint redundant_imports

e42b6ac

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint if_then_some_else_none

09cab3a

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint unneeded_field_pattern

add3693

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint redundant_type_annotations

188940a

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint clone_on_ref_ptr

2e7188f

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint undocumented_unsafe_blocks

59bdf0b

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint too_long_first_doc_paragraph

0ec9b74

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint renamed_function_params

de17919

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint empty_structs_with_brackets

f8c436e

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Ignore all results of the Clippy lint `empty_enum_variants_with_brack…

23ee316

…ets` Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Enable additional lints

97355e0

Enable additional lints. These have no results in our code but are suggested in: https://microsoft.github.io/rust-guidelines/guidelines/universal/index.html#clippy-lints

paldepind changed the title ~~Cargo: Enable most pedantic Clippy lints~~ Cargo: Enable most pedantic Clippy lints + some from nursery & restriction Nov 13, 2026

paldepind and others added 6 commits November 13, 2026 11:47

Fix all results of the Clippy lint redundant_clone

515e1df

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint or_fun_call

89781cf

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint collection_is_never_read

f648e70

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint needless_pass_by_ref_mut

b6347a6

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint unnecessary_struct_initialization

7e8b00f

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

Fix all results of the Clippy lint derive_partial_eq_without_eq

e7a5efb

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8f8a55e2-1e40-48cd-9120-9de95e969ee9

tausbn requested changes Nov 13, 2026

View reviewed changes

paldepind added 5 commits November 13, 2026 16:36

Revert "Fix all results of the Clippy lint match_same_arms"

d16b864

This reverts commit c522fd2.

Disable match_same_arms lint

eb4cc77

Revert "Fix all results of the Clippy lint struct_field_names"

1938c82

This reverts commit 96b6fb0.

Disable struct_field_names lint

aaee2b3

Address comments from review

379a161

Ruby: Extract helper function for coding word

2fa146b

tausbn approved these changes Nov 13, 2026

View reviewed changes

Conversation

paldepind commented Nov 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

asgerf left a comment

Choose a reason for hiding this comment

Uh oh!

paldepind commented Nov 13, 2026

Uh oh!

tausbn left a comment

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!

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!

Uh oh!

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!

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!

paldepind commented Nov 13, 2026

Uh oh!

tausbn left a comment

Choose a reason for hiding this comment

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

paldepind commented Nov 11, 2026 •

edited

Loading