pub struct MergeResult {
pub tree_hash: Hash,
pub conflicts: Vec<Conflict>,
}Expand description
Result of merge_trees. The tree_hash is always populated —
even on conflict — using “ours wins in the merged tree” as the
tie-breaker. Callers must check has_conflicts() before treating
the result as a clean merge.
Fields§
§tree_hash: Hash§conflicts: Vec<Conflict>Implementations§
Source§impl MergeResult
impl MergeResult
pub fn has_conflicts(&self) -> bool
Trait Implementations§
Source§impl Clone for MergeResult
impl Clone for MergeResult
Source§fn clone(&self) -> MergeResult
fn clone(&self) -> MergeResult
Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreSource§impl Debug for MergeResult
impl Debug for MergeResult
impl Eq for MergeResult
Source§impl PartialEq for MergeResult
impl PartialEq for MergeResult
Source§fn eq(&self, other: &MergeResult) -> bool
fn eq(&self, other: &MergeResult) -> bool
Tests for
self and other values to be equal, and is used by ==.impl StructuralPartialEq for MergeResult
Auto Trait Implementations§
impl Freeze for MergeResult
impl RefUnwindSafe for MergeResult
impl Send for MergeResult
impl Sync for MergeResult
impl Unpin for MergeResult
impl UnsafeUnpin for MergeResult
impl UnwindSafe for MergeResult
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<T> FutureExt for T
impl<T> FutureExt for T
Source§fn with_context(self, otel_cx: Context) -> WithContext<Self>
fn with_context(self, otel_cx: Context) -> WithContext<Self>
Source§fn with_current_context(self) -> WithContext<Self>
fn with_current_context(self) -> WithContext<Self>
impl<A, B, T> HttpServerConnExec<A, B> for Twhere
B: Body,
Source§impl<T> Instrument for T
impl<T> Instrument for T
Source§fn instrument(self, span: Span) -> Instrumented<Self>
fn instrument(self, span: Span) -> Instrumented<Self>
Source§fn in_current_span(self) -> Instrumented<Self>
fn in_current_span(self) -> Instrumented<Self>
Source§impl<T> IntoEither for T
impl<T> IntoEither for T
Source§fn into_either(self, into_left: bool) -> Either<Self, Self>
fn into_either(self, into_left: bool) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left is true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreSource§fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left(&self) returns true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read more