Repository navigation
fix(id): make world doctor journal check match restore (#1598) - #1600
Merged
Merged
Conversation
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
|
Caution Review failedThe pull request is closed. Finishing Touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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 #1598
validate_journal_fileinworld_doctor.rsnow agrees with the code that actually opens a journal:JOURNAL_VERSION..=MAX_JOURNAL_VERSION(1..=2), matchingWorldCore::restore(world/core.rs) — version 0 is refused instead of reported as a valid "format version 0".Createdmust be first; first entry must beCreated) use the count of parsed entries, not the raw split-line index, which blank lines skewed: a leading blank line no longer fails a valid journal and no longer lets a headerless journal pass. (read_journal_entriesinworld_store.rsskips blank lines before parsing, so restore judges the first parsed entry.) Malformed-entry errors keep the raw line number.New unit test
a_journal_version_zero_and_blank_lines_match_restorepins all three cases from #1598 (version 0, blank-line + Created, blank-line + headerless).Verification: probe crate on the laptop pre-fix showed doctor/restore divergence on all three cases (see #1598);
cargo test --lib world_doctoron the laptop after the fix — results in the closing note on #1598.Need help on this PR? Tag
@codesmith-botwith what you need.