Skip to main content

Merged

Struct Merged 

Source
pub struct Merged {
    pub doc: LeanManifest,
    pub foreign: Vec<(String, LeanEntry)>,
    pub overridden: Vec<(String, LeanEntry)>,
    pub deletes: BTreeMap<String, DeleteOutcome>,
    pub recreated: Vec<(String, String)>,
    pub over_theirs: Vec<(String, LeanEntry)>,
}
Expand description

What merge returns: the document, and what it decided per path.

Fields§

§doc: LeanManifest§foreign: Vec<(String, LeanEntry)>

Entries a consume must integrate next: present in theirs, changed vs base, not mine.

§overridden: Vec<(String, LeanEntry)>

Theirs’ version at a path this barrier uploaded, changed since the merge base (R7).

§deletes: BTreeMap<String, DeleteOutcome>

Every declared delete, and what the merge did with it.

§recreated: Vec<(String, String)>

The deletes mine publishes over: (path, the deleted version's etag) for a path mine uploads that the merge base cited and theirs deleted. Mine wins; the caller records each (the user’s rule: a delete over a dirty path lands, with a record).

§over_theirs: Vec<(String, LeanEntry)>

The versions mine DELETES over: theirs at a path this barrier deletes, changed since the merge base (M3, P1-lite). Mine wins; the caller preserves and records each before the collector takes it.

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> 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 = !

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

fn try_from(value: U) -> Result<T, !>

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.