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 strThe task statement the branch implements.
worktree: &'a PathAbsolute path of the throwaway worktree holding the standing rebase.
branch: &'a strBranch being rebased.
onto: &'a strRef 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 strThe conflicted regions, markers included.
round: usizeThis conflict round, 1-based.
cap: usizeThe round budget.
language: &'a strReply language.
github_language: &'a strLanguage 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> 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
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> ⓘ
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> ⓘ
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