fix(history): satisfy imported window clippy - #752
Open
beruro wants to merge 1 commit into
Open
Conversation
beruro
force-pushed
the
junyu/fix-imported-history-window-clippy
branch
from
August 10, 2026 05:18
5eb78c0 to
0292da4
Compare
beruro
force-pushed
the
junyu/fix-imported-history-window-clippy
branch
from
August 10, 2026 05:20
0292da4 to
8b5dc34
Compare
This was referenced Aug 10, 2026
Collaborator
Author
|
Merge-order note: this PR fixes the current develop Rust Clippy baseline; #753 independently fixes the current develop frontend test baseline. The current frontend job here passed typecheck and lint, then failed only the four tests covered by #753. After either baseline PR lands, the remaining PR should be rebased and rerun so both required jobs become green. |
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.
Problem
The current
developbranch fails strict Rust Clippy in imported-history window construction because a nestedelse { if let ... }triggersclippy::collapsible_else_ifunder-D warnings. This blocks Rust CI for every branch rebased ontodevelop.Solution
Collapse the nested conditional into
else if letwhile preserving all three existing paths: loaded turns retain full chunks, unloaded indexed turns retain previews and placeholders, and missing turn metadata retains the original user chunk while discarding its orphaned body chunks.Potential risks
The change is a control-flow-only rewrite with no data-format, persistence, API, dependency, concurrency, or UI changes. The related imported-history tests cover the affected window behavior. Rollback is a normal revert of this commit.
Verification
Completed again on published head
8b5dc34e6, rebased ontodevelopat9a2d6f6cf:rustfmt --edition 2021 --check crates/orgtrack-core/src/sources/imported_history/window.rs— passed.cargo test -p orgtrack_core imported_history --lib— passed, 72 tests; 2 existing benchmark/integration tests ignored.cargo clippy -p orgtrack_core --all-targets --no-deps -- -D warnings— passed.git diff --check— passed.src-tauri/crates/orgtrack-core/src/sources/imported_history/window.rs. Two unrelated UI commits introduced by an automated branch update were removed before publication.cargo fmt --check --allwas also attempted but is currently blocked by unrelated pre-existing formatting drift elsewhere ondevelop; this PR does not include that repository-wide churn.