conflicts: propagate error from conflict materialization #3889
Conversation
This file contains 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
yuja
reviewed
Jun 15, 2024
I don't think the message adds anything over what the `BackendError` itself provides, so let's use `transparent` instead. I also dropped the `Internal` prefix from the variant because that also didn't seem to add anything.
The function has no callers outside the module anymore (probably since `MaterializeTreeValue` but I haven't checked). Inlining it will help keep error handling simple in the next commit. Otherwise we'd need to have it return an error type wrapping both `BackendError` and `io::Error`.
martinvonz
force-pushed
the
push-ktwksnrlrqmq
branch
from
a592a90 to
9c12c74
Compare
martinvonz
force-pushed
the
push-ktwksnrlrqmq
branch
from
9c12c74 to
71b832f
Compare
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.
Checklist
If applicable:
CHANGELOG.md