Skip to main content

MergeResult

tsafe_core::sync

Struct MergeResult

pub struct MergeResult {
    pub merged: VaultFile,
    pub added_from_theirs: Vec<String>,
    pub updated_from_theirs: Vec<String>,
    pub added_from_ours: Vec<String>,
    pub conflicts: Vec<String>,
    pub deleted: Vec<String>,
    pub is_noop: bool,
    pub decisions: Vec<MergeDecision>,
}

Expand description

Result of a three-way merge between base, ours (local), and theirs (remote) vault files.

Fields§

§merged: VaultFile

The merged vault file — ready to write to disk.

§added_from_theirs: Vec<String>

Keys added from theirs (remote additions we didn’t have).

§updated_from_theirs: Vec<String>

Keys updated from theirs (we were stale, theirs was newer).

§added_from_ours: Vec<String>

Keys added from ours (local additions not on remote).

§conflicts: Vec<String>

Keys where both sides changed — resolved by last-write-wins.

§deleted: Vec<String>

Keys deleted (removed from one or both sides).

§is_noop: bool

True if nothing changed (ours == theirs at the key level).

§decisions: Vec<MergeDecision>

Explicit per-key merge outcomes in deterministic key order.

Trait Implementations§

impl Debug for MergeResult

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

Formats the value using the given formatter. Read more

Auto Trait Implementations§

impl Freeze for MergeResult

impl RefUnwindSafe for MergeResult

impl Send for MergeResult

impl Sync for MergeResult

impl Unpin for MergeResult

impl UnsafeUnpin for MergeResult

impl UnwindSafe for MergeResult

Blanket Implementations§

impl<T> Any for T
where T: 'static + ?Sized,

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more

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

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more

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

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

Mutably borrows from an owned value. Read more

impl<T> From<T> for T

fn from(t: T) -> T

Returns the argument unchanged.

impl<T> Instrument for T

fn instrument(self, span: Span) -> Instrumented<Self>

Instruments this type with the provided Span, returning an Instrumented wrapper. Read more

fn in_current_span(self) -> Instrumented<Self>

Instruments this type with the current Span, returning an Instrumented wrapper. Read more

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

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

impl<T> Same for T

type Output = T

Should always be Self

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

type Error = Infallible

The type returned in the event of a conversion error.

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

Performs the conversion.

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

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

The type returned in the event of a conversion error.

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

Performs the conversion.

impl<V, T> VZip<V> for T
where V: MultiLane<T>,

fn vzip(self) -> V

impl<T> WithSubscriber for T

fn with_subscriber<S>(self, subscriber: S) -> WithDispatch<Self>
where S: Into<Dispatch>,

Attaches the provided Subscriber to this type, returning a WithDispatch wrapper. Read more

fn with_current_subscriber(self) -> WithDispatch<Self>

Attaches the current default Subscriber to this type, returning a WithDispatch wrapper. Read more