ci: bump rust-toolchain to 1.95.0 and apply clippy --fix#313
Merged
estesp merged 1 commit intocontainerd:masterfrom May 2, 2026
Merged
ci: bump rust-toolchain to 1.95.0 and apply clippy --fix#313estesp merged 1 commit intocontainerd:masterfrom
estesp merged 1 commit intocontainerd:masterfrom
Conversation
The current 1.81.0 pin can no longer resolve the checked-in Cargo.lock: transitive dependencies (home v0.5.12 among others) now require edition2024 and rustc >= 1.88, neither of which 1.81 supports. 1.95.0 is current stable at time of writing, and successfully resolves and compiles the full workspace (crate, compiler, codegen, examples). Newer clippy then flags a handful of stylistic issues that trip `-D warnings` in `make check-all`: - io::Error::new(ErrorKind::Other, ...) -> io::Error::other(...) - .map_or(false, ...) -> .is_some_and(...) - unnecessary explicit lifetimes (foo<'a> -> foo<'_>) - .ok_or_else(|| lit) -> .ok_or(lit) - redundant .into_iter() on an IntoIterator argument - a few match-one-pattern reductions to `?` / if-let-guard These are all applied via `cargo clippy --fix` and then `cargo fmt` and reviewed; no behavior change. The one manually added line is a `#![allow(clippy::zombie_processes)]` at the top of tests/run-examples.rs where the lint is a false positive (the branching cleanup does wait on each spawned child, clippy just can't see it through the control flow). Locally verified: `make check-all`, `make`, `make -C compiler`, `make -C ttrpc-codegen`, `make -C example build-examples` all pass. Signed-off-by: Shiv Bhosale <shvbsle@amazon.com>
shvbsle
changed the title
Contributor
Author
|
@wllenyj @Tim-Zhang can I get a review for this PR? |
wllenyj
approved these changes
Apr 23, 2026
tzneal
approved these changes
May 2, 2026
estesp
approved these changes
May 2, 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
4 participants
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.
Why
CI is currently red for every PR:
cargo 1.81(pinned inrust-toolchain.toml) can no longer resolve the checked-inCargo.lock. Transitive deps such ashome v0.5.12now requireedition2024andrustc >= 1.88, neither available on 1.81. Every matrix leg (Check, Build, deny) fails atcargo metadatabefore it can do anything useful.What
rust-toolchain.tomlto1.95.0(current stable).cargo clippy --fixsuggestions that newer clippy surfaces under-D warnings. All mechanical:io::Error::new(ErrorKind::Other, ...)->io::Error::other(...).map_or(false, ...)->.is_some_and(...).ok_or_else(|| lit)->.ok_or(lit)foo<'a>->foo<'_>).into_iter()on anIntoIteratorargumentmatch Some/None -> return Nonereductions to?/ if-let-guard#![allow(clippy::zombie_processes)]totests/run-examples.rs. The lint is a false positive;wait_with_outputis called on every cleanup path, clippy just cannot see through the control flow.No behavior change.
Verified locally
make check-all,make,make -C compiler,make -C ttrpc-codegen,make -C example build-examplesall pass.Note
Advertised MSRV in
Cargo.toml(rust-version = "1.70") is unchanged. That's a promise to crate consumers and is independent of the toolchain the repo uses to build itself.