#[non_exhaustive]pub enum MergeError {
Driver {
line: String,
reason: &'static str,
},
NoDriver {
program: String,
},
Run {
program: String,
reason: String,
},
Unresolved {
paths: Vec<RelPath>,
},
NothingToContinue,
NothingToAbort,
ChangedSince {
paths: Vec<String>,
},
CorruptUndo {
path: String,
},
Unmerged {
path: RelPath,
},
Invalid {
path: RelPath,
reason: String,
},
}Expand description
Why a merge cannot run, or its resolution cannot be installed.
Variants (Non-exhaustive)§
This enum is marked as non-exhaustive
Non-exhaustive enums could have additional variants added in future. Therefore, when matching against variants of non-exhaustive enums, an extra wildcard arm must be added to account for any future variants.
Driver
A driver line does not parse.
NoDriver
The driver’s program is not installed, or not on PATH.
Run
A driver program did not run to completion.
Unresolved
Conflicts wait in .devset/conflicts/.
NothingToContinue
Resolutions were to be installed, and no conflict waits.
NothingToAbort
A conflicted run was to be taken back, and none is unfinished.
ChangedSince
Taking a conflicted run back would discard changes made since it.
CorruptUndo
A copy an update saved, to take it back, is missing or damaged.
Unmerged
A resolution still has conflict markers.
Invalid
A resolution does not pass its file’s check.
Trait Implementations§
Source§impl Clone for MergeError
impl Clone for MergeError
Source§impl Debug for MergeError
impl Debug for MergeError
Source§impl Display for MergeError
impl Display for MergeError
impl Eq for MergeError
Source§impl Error for MergeError
impl Error for MergeError
1.30.0 · Source§fn source(&self) -> Option<&(dyn Error + 'static)>
fn source(&self) -> Option<&(dyn Error + 'static)>
Returns the lower-level source of this error, if any. Read more
1.0.0 · Source§fn description(&self) -> &str
fn description(&self) -> &str
👎Deprecated since 1.42.0:
use the Display impl or to_string()
Source§impl From<MergeError> for Error
impl From<MergeError> for Error
Source§fn from(source: MergeError) -> Self
fn from(source: MergeError) -> Self
Converts to this type from the input type.
Source§impl PartialEq for MergeError
impl PartialEq for MergeError
impl StructuralPartialEq for MergeError
Auto Trait Implementations§
impl Freeze for MergeError
impl RefUnwindSafe for MergeError
impl Send for MergeError
impl Sync for MergeError
impl Unpin for MergeError
impl UnsafeUnpin for MergeError
impl UnwindSafe for MergeError
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more
Source§impl<T> CloneToUninit for Twhere
T: Clone,
impl<T> CloneToUninit for Twhere
T: Clone,
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§fn equivalent(&self, key: &K) -> bool
fn equivalent(&self, key: &K) -> bool
Compare self to
key and return true if they are equal.