pub enum ConflictDiffMethod {
Materialize,
Pair,
}
Expand description
How conflicts are processed and rendered in diffs.
Variants§
Materialize
Compares materialized contents.
Pair
Compares individual pairs of left and right contents.
Trait Implementations§
Source§impl Clone for ConflictDiffMethod
impl Clone for ConflictDiffMethod
Source§fn clone(&self) -> ConflictDiffMethod
fn clone(&self) -> ConflictDiffMethod
Returns a duplicate of the value. Read more
1.0.0 · Source§const fn clone_from(&mut self, source: &Self)
const fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source
. Read moreSource§impl Debug for ConflictDiffMethod
impl Debug for ConflictDiffMethod
Source§impl Default for ConflictDiffMethod
impl Default for ConflictDiffMethod
Source§fn default() -> ConflictDiffMethod
fn default() -> ConflictDiffMethod
Returns the “default value” for a type. Read more
Source§impl<'de> Deserialize<'de> for ConflictDiffMethod
impl<'de> Deserialize<'de> for ConflictDiffMethod
Source§fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
Source§impl PartialEq for ConflictDiffMethod
impl PartialEq for ConflictDiffMethod
impl Copy for ConflictDiffMethod
impl Eq for ConflictDiffMethod
impl StructuralPartialEq for ConflictDiffMethod
Auto Trait Implementations§
impl Freeze for ConflictDiffMethod
impl RefUnwindSafe for ConflictDiffMethod
impl Send for ConflictDiffMethod
impl Sync for ConflictDiffMethod
impl Unpin for ConflictDiffMethod
impl UnwindSafe for ConflictDiffMethod
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.Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
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