pub struct ConflictEntry {
pub path_bytes: Vec<u8>,
pub path: String,
pub side: ConflictSide,
}Expand description
A single conflicted path entry captured from git2::Index::conflicts.
Git paths are raw bytes (conventionally UTF-8, but not guaranteed to be),
so the entry stores both the exact path_bytes — used
for identity/dedup — and a lossy path display string.
Fields§
§path_bytes: Vec<u8>Raw repository-relative path bytes, as libgit2 reports them.
path: StringLossy UTF-8 display form of path_bytes. Two
distinct non-UTF-8 paths may share this display string, so use
path_bytes for identity comparisons.
side: ConflictSideWhich stage of the three-way merge this entry represents.
Trait Implementations§
Source§impl Clone for ConflictEntry
impl Clone for ConflictEntry
Source§fn clone(&self) -> ConflictEntry
fn clone(&self) -> ConflictEntry
Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · 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 ConflictEntry
impl Debug for ConflictEntry
Source§impl PartialEq for ConflictEntry
impl PartialEq for ConflictEntry
Source§fn eq(&self, other: &ConflictEntry) -> bool
fn eq(&self, other: &ConflictEntry) -> bool
Tests for
self and other values to be equal, and is used by ==.impl Eq for ConflictEntry
impl StructuralPartialEq for ConflictEntry
Auto Trait Implementations§
impl Freeze for ConflictEntry
impl RefUnwindSafe for ConflictEntry
impl Send for ConflictEntry
impl Sync for ConflictEntry
impl Unpin for ConflictEntry
impl UnsafeUnpin for ConflictEntry
impl UnwindSafe for ConflictEntry
Blanket Implementations§
§impl<T> AnySync for T
impl<T> AnySync for T
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,
§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
§fn equivalent(&self, key: &K) -> bool
fn equivalent(&self, key: &K) -> bool
Compare self to
key and return true if they are equal.§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
§fn equivalent(&self, key: &K) -> bool
fn equivalent(&self, key: &K) -> bool
Checks if this value is equivalent to the given key. Read more
§impl<T> Identity for Twhere
T: ?Sized,
impl<T> Identity for Twhere
T: ?Sized,
§impl<T> Instrument for T
impl<T> Instrument for T
§fn instrument(self, span: Span) -> Instrumented<Self>
fn instrument(self, span: Span) -> Instrumented<Self>
§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§impl<T> Pointable for T
impl<T> Pointable for T
§impl<T> PolicyExt for Twhere
T: ?Sized,
impl<T> PolicyExt for Twhere
T: ?Sized,
§impl<T> ServiceExt for T
impl<T> ServiceExt for T
§fn map_response_body<F>(self, f: F) -> MapResponseBody<Self, F>where
Self: Sized,
fn map_response_body<F>(self, f: F) -> MapResponseBody<Self, F>where
Self: Sized,
Apply a transformation to the response body. Read more
§fn trace_for_http(self) -> Trace<Self, SharedClassifier<ServerErrorsAsFailures>>where
Self: Sized,
fn trace_for_http(self) -> Trace<Self, SharedClassifier<ServerErrorsAsFailures>>where
Self: Sized,
High level tracing that classifies responses using HTTP status codes. Read more
§fn trace_for_grpc(self) -> Trace<Self, SharedClassifier<GrpcErrorsAsFailures>>where
Self: Sized,
fn trace_for_grpc(self) -> Trace<Self, SharedClassifier<GrpcErrorsAsFailures>>where
Self: Sized,
High level tracing that classifies responses using gRPC headers. Read more