refactor: fix misspelled identifiers in conflict and choice handling - #1066
Merged
marcospb19 merged 1 commit intoSep 4, 2026
Merged
Conversation
Renames consistently misspelled identifiers introduced in ouch-org#779: - `FileConflitOperation` -> `FileConflictOperation` - `choises` / `choise` / `Choise` -> `choices` / `choice` / `Choice` (field, parameter, locals, doc comments) The surrounding code already spells these words correctly (`resolve_path_conflict`, `resolve_extraction_conflict`, `pub struct Choice`, user-facing "Handle file conflict for ..." strings), so the old names read as typos rather than intentional naming. Pure rename: - no behavior change and no output strings touched, so UI test snapshots are unaffected (per CONTRIBUTING.md) - `ouch` is a binary crate, so nothing outside the crate can depend on these names - a repo-wide grep confirms every occurrence lives in `src/utils/question.rs` and `src/utils/fs.rs` Also fixes one misspelled test comment in `src/utils/formatting.rs` ("aproximation").
foorgange
force-pushed
the
fix/typo-file-conflict-identifiers
branch
from
September 4, 2026 15:18
5c2da97 to
fd84326
Compare
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
2 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.
Renames consistently misspelled identifiers introduced in #779:
FileConflitOperation->FileConflictOperationchoises/choise/Choise->choices/choice/Choice(field, parameter, locals, doc comments)The surrounding code already spells these words correctly (
resolve_path_conflict,resolve_extraction_conflict,pub struct Choice, user-facing "Handle file conflict for ..." strings), so the old names read as typos rather than intentional naming.Pure rename:
ouchis a binary crate, so nothing outside the crate can depend on these namessrc/utils/question.rsandsrc/utils/fs.rsAlso fixes one misspelled test comment in
src/utils/formatting.rs("aproximation").