This repository was archived by the owner on Oct 11, 2023. It is now read-only.
Fix: handle errors on 'merge' instead of 'merge_allowed'#292
Merged
joao-paulo-parity merged 1 commit intomasterfrom May 27, 2021
Merged
Fix: handle errors on 'merge' instead of 'merge_allowed'#292joao-paulo-parity merged 1 commit intomasterfrom
joao-paulo-parity merged 1 commit intomasterfrom
Conversation
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
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.
It came to me hours after implementing #291 that the error handling had been terribly misplaced. It's
mergethat might return aMergeFailureWillBeSolvedLater, notmerge_allowed.This kind of mistake is not easy to prevent at the moment because every error variant is jammed into the big dreadful
Errorenum, thus there's no help at compile time for narrowing specific errors to handle for specific functions - you basically have to read their implementation to know which errors are relevant for them. It certainly should be improved in the future. There are widely-known Rust practices for preventing this kind of "code smell".