Sort sequences in sort_maps to fix non-deterministic HashSet snapshots#876
Merged
max-sixty merged 1 commit intomitsuhiko:masterfrom Feb 13, 2026
Merged
Sort sequences in sort_maps to fix non-deterministic HashSet snapshots#876max-sixty merged 1 commit intomitsuhiko:masterfrom
sort_maps to fix non-deterministic HashSet snapshots#876max-sixty merged 1 commit intomitsuhiko:masterfrom
Conversation
…shots `sort_maps` only sorted `Content::Map` but `HashSet` serializes as `Content::Seq`, leaving its snapshot output non-deterministic across recompilations. Extend `sort_maps` to also sort `Content::Seq` items. Closes mitsuhiko#211 Co-Authored-By: Claude <noreply@anthropic.com>
Merged
max-sixty
added a commit
that referenced
this pull request
Mar 27, 2026
## Summary - Bump version to 1.47.0 - Update CHANGELOG ### Changes included in this release - Add `Comparator` trait for customizing how snapshot values are compared. #872 (@dstu) - Sort sequences in `sort_maps` to fix non-deterministic `HashSet` snapshots. #876 - Improve TOML serialization error message for unsupported types. #880 - Remove unnecessary `Send + Sync` bounds from `Redaction`, allowing non-`Send` closures in dynamic redactions. #874 - Don't use `Arc` in `Settings` unnecessarily. #873 (@dstu) - Upgrade `console` to 0.16 and MSRV to 1.66. #885 - Upgrade `toml-edit` to 0.25. #882 (@alexanderkjall) > _This was written by Claude Code on behalf of max-sixty_ Co-authored-by: Claude <noreply@anthropic.com>
|
This isn't just scoped to |
Collaborator
Author
|
I will revert |
max-sixty
added a commit
to max-sixty/insta
that referenced
this pull request
Mar 29, 2026
…et` snapshots (mitsuhiko#876)" This reverts commit ebe5a6e.
max-sixty
added a commit
to max-sixty/insta
that referenced
this pull request
Mar 29, 2026
Reverts mitsuhiko#876 (sort sequences in `sort_maps`) which was a breaking change — it sorted all `Seq` values including `Vec`, not just `HashSet`. Co-Authored-By: Claude <noreply@anthropic.com>
max-sixty
added a commit
that referenced
this pull request
Mar 29, 2026
Reverts #876 — the `sort_maps` change in 1.47.0 sorted all `Seq` values (including `Vec`), not just non-deterministic collections like `HashSet`. This was a breaking change for anyone relying on ordered sequence output with `sort_maps` enabled. Thanks to @spinda for reporting in #876. > _This was written by Claude Code on behalf of max-sixty_ --------- Co-authored-by: Claude <noreply@anthropic.com>
max-sixty
added a commit
to max-sixty/insta
that referenced
this pull request
Mar 29, 2026
Ensures sort_maps only sorts map keys, not sequence values. The bug in mitsuhiko#876 sorted all Seq values (including Vec), which broke snapshot stability for ordered collections. Co-Authored-By: Claude <noreply@anthropic.com>
max-sixty
added a commit
that referenced
this pull request
Mar 29, 2026
Adds a regression test ensuring `sort_maps` only sorts map keys, not sequence values. The bug in #876 sorted all `Seq` values (including `Vec`), which broke snapshot stability for ordered collections. The test snapshots a `HashMap` containing a `Vec` with `sort_maps` enabled and asserts the Vec order is preserved. > _This was written by Claude Code on behalf of max-sixty_ --------- Co-authored-by: Claude <noreply@anthropic.com>
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.
Summary
sort_mapsonly sortedContent::Map, butHashSetserializes asContent::Seqvia serde, leaving snapshot output non-deterministic across recompilationssort_maps()to also sortContent::Seqitems using the same key-based comparisoncmp_as_keyhelper to deduplicate comparison logic between Map and Seq sortingset_sort_maps/sort_mapsdoc comments to reflect the expanded scopeCloses #211
Test plan
test_sort_maps_sorts_hashsetverifying bothHashSetandHashMapproduce deterministic sorted output--all-features