[−][src]Enum diffy::ConflictStyle

pub enum ConflictStyle {
    Merge,
    Diff3,
}

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

`impl Clone for ConflictStyle`[src]

`fn clone(&self) -> ConflictStyle`[src]

`fn clone_from(&mut self, source: &Self)`1.0.0[src]

`impl Copy for ConflictStyle`[src]

`impl Debug for ConflictStyle`[src]

`fn fmt(&self, f: &mut Formatter) -> Result`[src]

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,` [src]

`fn type_id(&self) -> TypeId`[src]

`impl<T> Borrow<T> for T where T: ?Sized,` [src]

`fn borrow(&self) -> &T`[src]

`impl<T> BorrowMut<T> for T where T: ?Sized,` [src]

`fn borrow_mut(&mut self) -> &mut T`[src]

`impl<T> From<T> for T`[src]

`fn from(t: T) -> T`[src]

`impl<T, U> Into for T where U: From<T>,` [src]

`fn into(self) -> U`[src]

`impl<T> ToOwned for T where T: Clone,` [src]

`type Owned = T`

The resulting type after obtaining ownership.

`fn to_owned(&self) -> T`[src]

`fn clone_into(&self, target: &mut T)`[src]

`impl<T, U> TryFrom for T where U: Into<T>,` [src]

`type Error = Infallible`

The type returned in the event of a conversion error.

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

`impl<T, U> TryInto for T where U: TryFrom<T>,` [src]

`type Error = >::Error`

The type returned in the event of a conversion error.

[−][src]Enum diffy::ConflictStyle

Variants

Trait Implementations

`impl Clone for ConflictStyle`[src]

`fn clone(&self) -> ConflictStyle`[src]

`fn clone_from(&mut self, source: &Self)`1.0.0[src]

`impl Copy for ConflictStyle`[src]

`impl Debug for ConflictStyle`[src]

`fn fmt(&self, f: &mut Formatter) -> Result`[src]

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,` [src]

`fn type_id(&self) -> TypeId`[src]

`impl<T> Borrow<T> for T where T: ?Sized,` [src]

`fn borrow(&self) -> &T`[src]

`impl<T> BorrowMut<T> for T where T: ?Sized,` [src]

`fn borrow_mut(&mut self) -> &mut T`[src]

`impl<T> From<T> for T`[src]

`fn from(t: T) -> T`[src]

`impl<T, U> Into<U> for T where U: From<T>,` [src]

`fn into(self) -> U`[src]

`impl<T> ToOwned for T where T: Clone,` [src]

`type Owned = T`

`fn to_owned(&self) -> T`[src]

`fn clone_into(&self, target: &mut T)`[src]

`impl<T, U> TryFrom<U> for T where U: Into<T>,` [src]

`type Error = Infallible`

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

`impl<T, U> TryInto<U> for T where U: TryFrom<T>,` [src]

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

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

[−][src]Enum diffy::ConflictStyle

Variants

Trait Implementations

impl Clone for ConflictStyle[src]

fn clone(&self) -> ConflictStyle[src]

fn clone_from(&mut self, source: &Self)1.0.0[src]

impl Copy for ConflictStyle[src]

impl Debug for ConflictStyle[src]

fn fmt(&self, f: &mut Formatter) -> Result[src]

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, [src]

fn type_id(&self) -> TypeId[src]

impl<T> Borrow<T> for T where T: ?Sized, [src]

fn borrow(&self) -> &T[src]

impl<T> BorrowMut<T> for T where T: ?Sized, [src]

fn borrow_mut(&mut self) -> &mut T[src]

impl<T> From<T> for T[src]

fn from(t: T) -> T[src]

impl<T, U> Into<U> for T where U: From<T>, [src]

fn into(self) -> U[src]

impl<T> ToOwned for T where T: Clone, [src]

type Owned = T

fn to_owned(&self) -> T[src]

fn clone_into(&self, target: &mut T)[src]

impl<T, U> TryFrom<U> for T where U: Into<T>, [src]

type Error = Infallible

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

impl<T, U> TryInto<U> for T where U: TryFrom<T>, [src]

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

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

`impl Clone for ConflictStyle`[src]

`fn clone(&self) -> ConflictStyle`[src]

`fn clone_from(&mut self, source: &Self)`1.0.0[src]

`impl Copy for ConflictStyle`[src]

`impl Debug for ConflictStyle`[src]

`fn fmt(&self, f: &mut Formatter) -> Result`[src]

`impl RefUnwindSafe for ConflictStyle`

`impl Send for ConflictStyle`

`impl Sync for ConflictStyle`

`impl Unpin for ConflictStyle`

`impl UnwindSafe for ConflictStyle`

`impl<T> Any for T where T: 'static + ?Sized,` [src]

`fn type_id(&self) -> TypeId`[src]

`impl<T> Borrow<T> for T where T: ?Sized,` [src]

`fn borrow(&self) -> &T`[src]

`impl<T> BorrowMut<T> for T where T: ?Sized,` [src]

`fn borrow_mut(&mut self) -> &mut T`[src]

`impl<T> From<T> for T`[src]

`fn from(t: T) -> T`[src]

`impl<T, U> Into<U> for T where U: From<T>,` [src]

`fn into(self) -> U`[src]

`impl<T> ToOwned for T where T: Clone,` [src]

`type Owned = T`

`fn to_owned(&self) -> T`[src]

`fn clone_into(&self, target: &mut T)`[src]

`impl<T, U> TryFrom<U> for T where U: Into<T>,` [src]

`type Error = Infallible`

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

`impl<T, U> TryInto<U> for T where U: TryFrom<T>,` [src]

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

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