Skip to main content

MergeInput

Struct MergeInput 

Source
pub struct MergeInput<'a> {
Show 14 fields pub base: &'a [u8], pub ours: &'a [u8], pub theirs: &'a [u8], pub label_ours: &'a str, pub label_base: &'a str, pub label_theirs: &'a str, pub favor: MergeFavor, pub style: ConflictStyle, pub marker_size: usize, pub diff_algorithm: Option<String>, pub ignore_all_space: bool, pub ignore_space_change: bool, pub ignore_space_at_eol: bool, pub ignore_cr_at_eol: bool,
}
Expand description

Input and options for a three-way merge.

Fields§

§base: &'a [u8]

Base (ancestor) content.

§ours: &'a [u8]

Our version of the file.

§theirs: &'a [u8]

Their version of the file.

§label_ours: &'a str

Label for the ours conflict marker line.

§label_base: &'a str

Label for the base conflict marker line (diff3 only).

§label_theirs: &'a str

Label for the theirs conflict marker line.

§favor: MergeFavor

Conflict resolution strategy.

§style: ConflictStyle

Conflict marker style.

§marker_size: usize

Width of conflict markers in characters (0 → use default of 7).

§diff_algorithm: Option<String>

Diff algorithm.

§ignore_all_space: bool

Ignore all whitespace when comparing lines (-w).

§ignore_space_change: bool

Ignore changes in amount of whitespace (-b).

§ignore_space_at_eol: bool

Ignore whitespace at end of line.

§ignore_cr_at_eol: bool

Ignore CR at end of line.

Auto Trait Implementations§

§

impl<'a> Freeze for MergeInput<'a>

§

impl<'a> RefUnwindSafe for MergeInput<'a>

§

impl<'a> Send for MergeInput<'a>

§

impl<'a> Sync for MergeInput<'a>

§

impl<'a> Unpin for MergeInput<'a>

§

impl<'a> UnsafeUnpin for MergeInput<'a>

§

impl<'a> UnwindSafe for MergeInput<'a>

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,

Source§

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more
Source§

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

Source§

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

Mutably borrows from an owned value. Read more
Source§

impl<T> From<T> for T

Source§

fn from(t: T) -> T

Returns the argument unchanged.

Source§

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

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> Same for T

Source§

type Output = T

Should always be Self
Source§

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

Source§

type Error = Infallible

The type returned in the event of a conversion error.
Source§

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

Performs the conversion.
Source§

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

Source§

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

The type returned in the event of a conversion error.
Source§

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

Performs the conversion.