pub struct ThreeWayDiff {
pub files: HashMap<String, ThreeWayStatus>,
pub conflicts: Vec<String>,
pub auto_mergeable: Vec<String>,
}Expand description
Result of a three-way diff operation.
Fields§
§files: HashMap<String, ThreeWayStatus>Status of each file by path.
conflicts: Vec<String>Paths that have conflicts (subset of files where status.is_conflict()).
auto_mergeable: Vec<String>Paths that can be auto-merged (subset of files where status.is_auto_mergeable()).
Implementations§
Source§impl ThreeWayDiff
impl ThreeWayDiff
Trait Implementations§
Source§impl Clone for ThreeWayDiff
impl Clone for ThreeWayDiff
Source§fn clone(&self) -> ThreeWayDiff
fn clone(&self) -> ThreeWayDiff
Returns a duplicate of the value. Read more
1.0.0 · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreSource§impl Debug for ThreeWayDiff
impl Debug for ThreeWayDiff
Source§impl<'de> Deserialize<'de> for ThreeWayDiff
impl<'de> Deserialize<'de> for ThreeWayDiff
Source§fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
Auto Trait Implementations§
impl Freeze for ThreeWayDiff
impl RefUnwindSafe for ThreeWayDiff
impl Send for ThreeWayDiff
impl Sync for ThreeWayDiff
impl Unpin for ThreeWayDiff
impl UnsafeUnpin for ThreeWayDiff
impl UnwindSafe for ThreeWayDiff
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more
Source§impl<T> CloneToUninit for Twhere
T: Clone,
impl<T> CloneToUninit for Twhere
T: Clone,
Source§impl<T> Instrument for T
impl<T> Instrument for T
Source§fn instrument(self, span: Span) -> Instrumented<Self>
fn instrument(self, span: Span) -> Instrumented<Self>
Source§fn in_current_span(self) -> Instrumented<Self>
fn in_current_span(self) -> Instrumented<Self>
Source§impl<T> IntoEither for T
impl<T> IntoEither for T
Source§fn into_either(self, into_left: bool) -> Either<Self, Self>
fn into_either(self, into_left: bool) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left is true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreSource§fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left(&self) returns true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read more