Enum diffy::ConflictStyle

source · [−]

pub enum ConflictStyle {
    Merge,
    Diff3,
}

Expand description

Style used when rendering a conflict

Variants

`Merge`

Renders conflicting lines from both files, separated by conflict markers.

<<<<<<< A
lines in file A
=======
lines in file B
>>>>>>> B

`Diff3`

Renders conflicting lines from both files including lines from the original files, separated by conflict markers.

<<<<<<< A
lines in file A
||||||| Original
lines in Original file
=======
lines in file B
>>>>>>> B

Trait Implementations

source

impl Clone for ConflictStyle

source

fn clone(&self) -> ConflictStyle

Returns a copy of the value. Read more

1.0.0 · source

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source. Read more

source

impl Debug for ConflictStyle

source

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter. Read more

source

impl Copy for ConflictStyle

Auto Trait Implementations

impl RefUnwindSafe for ConflictStyle

impl Send for ConflictStyle

impl Sync for ConflictStyle

impl Unpin for ConflictStyle

impl UnwindSafe for ConflictStyle

Blanket Implementations

source

impl<T> Any for T where
T: 'static + ?Sized,

source

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more

source

impl<T> Borrow<T> for T where
T: ?Sized,

const: unstable · source

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more

source

impl<T> BorrowMut<T> for T where
T: ?Sized,

const: unstable · source

fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more

source

impl<T> From<T> for T

const: unstable · source

fn from(t: T) -> T

Returns the argument unchanged.

source

impl<T, U> Into for T where
U: From<T>,

const: unstable · source

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

source

impl<T> ToOwned for T where
T: Clone,

type Owned = T

The resulting type after obtaining ownership.

source

fn to_owned(&self) -> T

Creates owned data from borrowed data, usually by cloning. Read more

source

fn clone_into(&self, target: &mut T)

Uses borrowed data to replace owned data, usually by cloning. Read more

source

impl<T, U> TryFrom for T where
U: Into<T>,

type Error = Infallible

The type returned in the event of a conversion error.

const: unstable · source

fn try_from(value: U) -> Result<T, <T as TryFrom>::Error>

Performs the conversion.

source

impl<T, U> TryInto for T where
U: TryFrom<T>,

type Error = >::Error

The type returned in the event of a conversion error.

const: unstable · source

fn try_into(self) -> Result<U, >::Error>

Performs the conversion.

Enum diffy::ConflictStyle

Variants

`Merge`

`Diff3`

Trait Implementations

impl Clone for ConflictStyle

fn clone(&self) -> ConflictStyle

fn clone_from(&mut self, source: &Self)

impl Debug for ConflictStyle

fn fmt(&self, f: &mut Formatter<'_>) -> Result

impl Copy for ConflictStyle

Auto Trait Implementations

impl RefUnwindSafe for ConflictStyle

impl Send for ConflictStyle

impl Sync for ConflictStyle

impl Unpin for ConflictStyle

impl UnwindSafe for ConflictStyle

Blanket Implementations

impl<T> Any for T where
T: 'static + ?Sized,

fn type_id(&self) -> TypeId

impl<T> Borrow<T> for T where
T: ?Sized,

fn borrow(&self) -> &T

impl<T> BorrowMut<T> for T where
T: ?Sized,

fn borrow_mut(&mut self) -> &mut T

impl<T> From<T> for T

fn from(t: T) -> T

impl<T, U> Into<U> for T where
U: From<T>,

fn into(self) -> U

impl<T> ToOwned for T where
T: Clone,

type Owned = T

fn to_owned(&self) -> T

fn clone_into(&self, target: &mut T)

impl<T, U> TryFrom<U> for T where
U: Into<T>,

type Error = Infallible

fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

impl<T, U> TryInto<U> for T where
U: TryFrom<T>,

type Error = <U as TryFrom<T>>::Error

fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

Enum diffy::ConflictStyle

Variants

Merge

Diff3

Trait Implementations

impl Clone for ConflictStyle

fn clone(&self) -> ConflictStyle

fn clone_from(&mut self, source: &Self)

impl Debug for ConflictStyle

fn fmt(&self, f: &mut Formatter<'_>) -> Result

impl Copy for ConflictStyle

Auto Trait Implementations

impl RefUnwindSafe for ConflictStyle

impl Send for ConflictStyle

impl Sync for ConflictStyle

impl Unpin for ConflictStyle

impl UnwindSafe for ConflictStyle

Blanket Implementations

impl<T> Any for T where T: 'static + ?Sized,

fn type_id(&self) -> TypeId

impl<T> Borrow<T> for T where T: ?Sized,

fn borrow(&self) -> &T

impl<T> BorrowMut<T> for T where T: ?Sized,

fn borrow_mut(&mut self) -> &mut T

impl<T> From<T> for T

fn from(t: T) -> T

impl<T, U> Into<U> for T where U: From<T>,

fn into(self) -> U

impl<T> ToOwned for T where T: Clone,

type Owned = T

fn to_owned(&self) -> T

fn clone_into(&self, target: &mut T)

impl<T, U> TryFrom<U> for T where U: Into<T>,

type Error = Infallible

fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

impl<T, U> TryInto<U> for T where U: TryFrom<T>,

type Error = <U as TryFrom<T>>::Error

fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

`Merge`

`Diff3`

impl<T> Any for T where
T: 'static + ?Sized,

impl<T> Borrow<T> for T where
T: ?Sized,

impl<T> BorrowMut<T> for T where
T: ?Sized,

impl<T, U> Into<U> for T where
U: From<T>,

impl<T> ToOwned for T where
T: Clone,

impl<T, U> TryFrom<U> for T where
U: Into<T>,

impl<T, U> TryInto<U> for T where
U: TryFrom<T>,