Skip to content

adapt to new rust lints and tweak ci#4249

Merged
WillLillis merged 3 commits intotree-sitter:masterfrom
WillLillis:appease_clippy
Mar 2, 2025
Merged

adapt to new rust lints and tweak ci#4249
WillLillis merged 3 commits intotree-sitter:masterfrom
WillLillis:appease_clippy

Conversation

@WillLillis
Copy link
Member

Fixes the CI failure discussed in #4244

CC @clason

@clason clason added the ci:backport release-0.25 Backport label label Feb 28, 2025
@clason clason enabled auto-merge (rebase) February 28, 2025 21:30
@WillLillis
Copy link
Member Author

Oh dear, looks like that's a bug in cargo itself.

@clason clason disabled auto-merge February 28, 2025 21:34
@WillLillis
Copy link
Member Author

WillLillis commented Feb 28, 2025

rust-lang/rust#137640 for the lint failure.

As for the failed test, I can't look too closely now but I suspect it's due to the recent changes in tree-sitter-rust: tree-sitter/tree-sitter-rust#254

Edit: I guess we'll have to wait until cargo's nightly channel is fixed.

@clason
Copy link
Contributor

clason commented Mar 1, 2025

Again, I'm wondering why you're YOLOing nightly Rust in CI...

@WillLillis
Copy link
Member Author

Again, I'm wondering why you're YOLOing nightly Rust in CI...

¯_(ツ)_/¯

I think amaanq likes to stay on top of the nightly lints. Maybe it would be better to run the nightly lints as a separate job and use stable for everything else? That way any new lint failures are visible, but issues in the nightly toolchain won't be a blocker like here.

@clason
Copy link
Contributor

clason commented Mar 1, 2025

Yes, that would be reasonable (and not mark it as required).

@WillLillis WillLillis force-pushed the appease_clippy branch 4 times, most recently from 302e853 to 7bb4ec9 Compare March 2, 2025 03:54
@WillLillis
Copy link
Member Author

WillLillis commented Mar 2, 2025

Something something first try?

Changes now include fixes for two new lints, test updates to reflect changes in tree-sitter-rust, as well as moving the nightly clippy invocation to a separate job that doesn't cause the action to fail. I'm not sure why +stable is necessary for the regular clippy invocation. Without it, clippy nightly 1.86 is used, leading to the crash mentioned above.

rust-lang/rust#137640 is closed as completed, but I'm still seeing the crash with nightly. It might be worth opening a separate issue.

@WillLillis WillLillis changed the title fix(rust): adapt to a new nightly lint adapt to new rust lints and tweak ci Mar 2, 2025
@WillLillis WillLillis merged commit 1fdd1d2 into tree-sitter:master Mar 2, 2025
20 checks passed
@tree-sitter-ci-bot
Copy link

Successfully created backport PR for release-0.25:

@WillLillis WillLillis deleted the appease_clippy branch March 2, 2025 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants