Resolve conflicts with buffer abstraction#11
Merged
ocdbytes merged 35 commits intoJul 12, 2026
Merged
Conversation
… update related methods
Buffer Abstraction
Resolve conflicts with the buffer abstraction while preserving parameter-selection protocol semantics.
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.
Context
This PR updates the source branch of worldfnd/whir#257 — Zook: Parameter Selection.
PR worldfnd#257 became conflicted after the buffer abstraction was merged into
worldfnd/whir:mainthrough worldfnd/whir#263.Changes
worldfnd/whir:maininto the parameter-selection branch.ActiveBuffer,Buffer, andBufferOpsAPIs.Testing
cargo test --all-targetscargo +nightly fmt --all -- --checkMerge requirement
Please use Create a merge commit.
Do not squash or rebase this PR: doing so would discard the
mainancestry and cause PR #257 to remain conflicted.