diffy

Struct MergeOptions

source
pub struct MergeOptions { /* private fields */ }
Expand description

A collection of options for modifying the way a merge is performed

Implementations§

source§

impl MergeOptions

source

pub fn new() -> Self

Constructs a new MergeOptions with default settings

§Defaults
  • conflict_marker_length = 7
  • style = ConflictStyle::Diff3
source

pub fn set_conflict_marker_length( &mut self, conflict_marker_length: usize, ) -> &mut Self

Set the length of the conflict markers used when displaying a merge conflict

source

pub fn set_conflict_style(&mut self, style: ConflictStyle) -> &mut Self

Set the conflict style used when displaying a merge conflict

source

pub fn merge<'a>( &self, ancestor: &'a str, ours: &'a str, theirs: &'a str, ) -> Result<String, String>

Merge two files, given a common ancestor, based on the configured options

source

pub fn merge_bytes<'a>( &self, ancestor: &'a [u8], ours: &'a [u8], theirs: &'a [u8], ) -> Result<Vec<u8>, Vec<u8>>

Perform a 3-way merge between potentially non-utf8 texts

Trait Implementations§

source§

impl Debug for MergeOptions

source§

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

Formats the value using the given formatter. Read more
source§

impl Default for MergeOptions

source§

fn default() -> Self

Returns the “default value” for a type. Read more

Auto Trait Implementations§

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, 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.