Skip to main content

RebaseConflict

Struct RebaseConflict 

Source
pub struct RebaseConflict<'a> {
    pub instruction: &'a str,
    pub worktree: &'a Path,
    pub branch: &'a str,
    pub onto: &'a str,
    pub paths: &'a [String],
    pub branch_subjects: &'a [String],
    pub onto_subjects: &'a [String],
    pub hunks: &'a str,
    pub round: usize,
    pub cap: usize,
    pub language: &'a str,
    pub github_language: &'a str,
}
Expand description

What the fixer is told when a rebase of the winning branch stopped on a conflict.

The heading phrase Your rebase stopped on a conflict is load-bearing: tests/common/mod.rs dispatches its mock on it.

worktree is spelled out as an absolute path because the seat’s conversation may remember the branch’s own worktree, and the resolution has to happen here, mid-rebase, not there.

Fields§

§instruction: &'a str

The task statement the branch implements.

§worktree: &'a Path

Absolute path of the throwaway worktree holding the standing rebase.

§branch: &'a str

Branch being rebased.

§onto: &'a str

Ref it is rebased onto.

§paths: &'a [String]

Paths git reports unmerged.

§branch_subjects: &'a [String]

Subjects of the branch’s own commits being replayed.

§onto_subjects: &'a [String]

Subjects of the commits the base gained.

§hunks: &'a str

The conflicted regions, markers included.

§round: usize

This conflict round, 1-based.

§cap: usize

The round budget.

§language: &'a str

Reply language.

§github_language: &'a str

Language for GitHub-facing text ([graph] github_language).

Auto Trait Implementations§

§

impl<'a> Freeze for RebaseConflict<'a>

§

impl<'a> RefUnwindSafe for RebaseConflict<'a>

§

impl<'a> Send for RebaseConflict<'a>

§

impl<'a> Sync for RebaseConflict<'a>

§

impl<'a> Unpin for RebaseConflict<'a>

§

impl<'a> UnsafeUnpin for RebaseConflict<'a>

§

impl<'a> UnwindSafe for RebaseConflict<'a>

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> Instrument for T

Source§

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

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

fn in_current_span(self) -> Instrumented<Self> ⓘ

Instruments this type with the current Span, returning an Instrumented wrapper. Read more
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> IntoEither for T

Source§

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 more
Source§

fn into_either_with<F>(self, into_left: F) -> Either<Self, Self> ⓘ
where F: FnOnce(&Self) -> bool,

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
Source§

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

Source§

fn and<P, B, E>(self, other: P) -> And<T, P>
where T: Sized + Policy<B, E>, P: Policy<B, E>,

Create a new Policy that returns Action::Follow only if self and other return Action::Follow. Read more
Source§

fn or<P, B, E>(self, other: P) -> Or<T, P>
where T: Sized + Policy<B, E>, P: Policy<B, E>,

Create a new Policy that returns Action::Follow if either self or other returns Action::Follow. Read more
Source§

impl<T, S> SimdFrom<T, S> for T
where S: Simd,

Source§

fn simd_from(_simd: S, value: T) -> T

Source§

impl<F, T, S> SimdInto<T, S> for F
where T: SimdFrom<F, S>, S: Simd,

Source§

fn simd_into(self, simd: S) -> T

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.
Source§

impl<T> WithSubscriber for T

Source§

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
Source§

fn with_current_subscriber(self) -> WithDispatch<Self> ⓘ

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