chore(rust): bump toolchain to 1.98 - #1824
Merged
mergify[bot] merged 1 commit intoSep 11, 2026
Merged
Conversation
renovate opened #1790 for this bump on 2026-08-27 and it has been red for two weeks: 1.98's clippy adds `manual_is_variant_and`, which fires once, on a `Result` treated as an `Option`: env::var("JENKINS_URL").ok().is_some_and(|v| !v.is_empty()) -> env::var("JENKINS_URL").is_ok_and(|v| !v.is_empty()) rust-toolchain.toml's own comment states the policy this follows: a bump PR that trips new lints fails CI and must fix them in the same PR, so the fix travels with the bump rather than in a follow-up. Verified locally against 1.98.1 with the exact CI steps (cargo fmt --check, clippy --workspace --all-targets --all-features --locked -D warnings, test --workspace --all-features --locked, build --release --locked): all pass, and clippy surfaces no other new lint beyond the one above. Supersedes #1790. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Change-Id: I8a70ab992f8ef05bf6662e83b111757f5f856ad8
Contributor
Merge Protections🟢 All 6 merge protections satisfied — ready to merge. Show 6 satisfied protections🟢 🤖 Continuous Integration
🟢 👀 Review Requirements
🟢 Enforce conventional commitMake sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 🔎 Reviews
🟢 📕 PR description
🟢 🚦 Auto-queueWhen all merge protections are satisfied, this pull request will be queued automatically. |
There was a problem hiding this comment.
🟢 Approval recommended
The toolchain bump is accompanied by the required Clippy-fix and the change is a behavior-preserving refactor.
Pull request overview
This PR updates the repository’s pinned Rust toolchain to 1.98 and includes the small, in-repo code change needed to satisfy a newly introduced Clippy lint under that toolchain.
Changes:
- Bump
rust-toolchain.tomlfrom Rust 1.97 to 1.98. - Update CI environment detection to use
Result::is_ok_and(addressing Clippy’smanual_is_variant_andlint).
File summaries
| File | Description |
|---|---|
| rust-toolchain.toml | Pins the workspace toolchain to Rust 1.98 for consistent CI/local builds. |
| crates/mergify-ci/src/detector.rs | Adjusts Jenkins env-var detection to satisfy new Clippy lint under Rust 1.98. |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
jd
marked this pull request as ready for review
September 11, 2026 06:59
kozlek
approved these changes
Sep 11, 2026
sileht
approved these changes
Sep 11, 2026
Contributor
Merge Queue Status
This pull request spent 8 minutes 50 seconds in the queue, including 7 minutes 55 seconds running CI. Required conditions to merge
|
40 tasks
mergify
Bot
deleted the
devs/jd/jd/rust-198/bump-toolchain-1-98--8a70ab99
branch
September 11, 2026 12:49
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.
renovate opened #1790 for this bump on 2026-08-27 and it has been red
for two weeks: 1.98's clippy adds
manual_is_variant_and, which firesonce, on a
Resulttreated as anOption:rust-toolchain.toml's own comment states the policy this follows: a
bump PR that trips new lints fails CI and must fix them in the same
PR, so the fix travels with the bump rather than in a follow-up.
Verified locally against 1.98.1 with the exact CI steps (cargo fmt
--check, clippy --workspace --all-targets --all-features --locked -D
warnings, test --workspace --all-features --locked, build --release
--locked): all pass, and clippy surfaces no other new lint beyond the
one above.
Supersedes #1790.
Co-Authored-By: Claude Sonnet 5 noreply@anthropic.com