Repository navigation
Fix #87: rust-version 1.95 and clippy 1.95 - #144
Merged
Merged
Conversation
egui 0.36 needs rustc 1.95 (hayro and krilla 1.92), so the declared 1.90 let cargo fail on dependency versions instead of naming the toolchain. Clippy 1.95 also flagged four collapsible matches that newer clippy no longer does; each is rewritten without changing behaviour. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 5, 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.
Fixes #87:
rust-versionnow says what the workspace really needs, and clippy on that minimum toolchain passes.rust-version = "1.95", up from 1.90. egui 0.36 and its crates need rustc 1.95, and hayro and krilla need 1.92. With 1.90–1.94, cargo now gives the clear "requires rustc 1.95" message instead of failing on dependency versions.collapsible_matchin four places that newer clippy no longer flags. Each fix keeps the behaviour the same:engine/src/cmd/pathops.rs: the empty-text arm becomes a match guard, and the arm after it is_ => {}.xtask/src/layers.rs: the testkit arm becomes a guard plus an explicitSome(Class::Testkit) => {}, so a testkit dev-dependency still isn't layer-checked.ui-egui/src/dialogs/new_document.rs: the condition is bound first, so falling through can't re-apply the preset.ui-egui/src/menus.rs(a test): a guard, with a_ => {}after it.Checks
cargo +1.95 clippy --workspace --all-targets -- -D warningspasses, with 1.95 installed for this check.cargo xtask cion stable passes all 7 steps (fmt, clippy, tests, assets, brands, layers, wasm): 2,924 tests.🤖 Generated with Claude Code