Enum BuiltinDriver

pub enum BuiltinDriver {
    Text,
    Binary,
    Union,
}

Define a built-in way of performing a three-way merge, including auto-resolution support.

Some values are related to diffing, some are related to conversions.

Variants

Text

Perform a merge between text-sources such that conflicts are marked according to merge.conflictStyle in the Git configuration.

If any of the inputs, base, ours or theirs looks like non-text/binary, the Binary driver will be used instead.

Also see builtin_driver::text::ConflictStyle.

Binary

Merge ‘unmergable’ content by choosing ours or theirs, without performing an actual merge.

Note that if the merge operation is for virtual ancestor (a merge for merge-bases), then ours will always be chosen.

Union

Merge text-sources and resolve conflicts by adding conflicting lines one after another, in random order, without adding conflict markers either.

This can be useful for files that change a lot, but will remain usable merely by adding all changed lines.

Implementations

impl BuiltinDriver

pub fn as_str(&self) -> &str

Return the name of this instance.

pub fn all() -> &'static [Self]

Get all available built-in drivers.

pub fn by_name(name: &str) -> Option<Self>

Try to match one of our variants to name, case-sensitive, and return its instance.

Trait Implementations

impl Clone for BuiltinDriver

fn clone(&self) -> BuiltinDriver

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for BuiltinDriver

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

Formats the value using the given formatter.

impl Default for BuiltinDriver

fn default() -> BuiltinDriver

Returns the “default value” for a type.

impl Hash for BuiltinDriver

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl Ord for BuiltinDriver

fn cmp(&self, other: &BuiltinDriver) -> Ordering

This method returns an Ordering between self and other.

fn max(self, other: Self) -> Self

where Self: Sized,

Compares and returns the maximum of two values.

fn min(self, other: Self) -> Self

where Self: Sized,

Compares and returns the minimum of two values.

fn clamp(self, min: Self, max: Self) -> Self

where Self: Sized,

Restrict a value to a certain interval.

impl PartialEq for BuiltinDriver

fn eq(&self, other: &BuiltinDriver) -> bool

Tests for self and other values to be equal, and is used by ==.

fn ne(&self, other: &Rhs) -> bool

Tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl PartialOrd for BuiltinDriver

fn partial_cmp(&self, other: &BuiltinDriver) -> Option<Ordering>

This method returns an ordering between self and other values if one exists.

fn lt(&self, other: &Rhs) -> bool

Tests less than (for self and other) and is used by the < operator.

fn le(&self, other: &Rhs) -> bool

Tests less than or equal to (for self and other) and is used by the <= operator.

fn gt(&self, other: &Rhs) -> bool

Tests greater than (for self and other) and is used by the > operator.

fn ge(&self, other: &Rhs) -> bool

Tests greater than or equal to (for self and other) and is used by the >= operator.

impl Copy for BuiltinDriver

impl Eq for BuiltinDriver

impl StructuralPartialEq for BuiltinDriver