pub struct ConflictRegion {
pub file_path: String,
pub start_pos: usize,
pub end_pos: usize,
pub start_line: usize,
pub end_line: usize,
pub our_content: String,
pub their_content: String,
pub conflict_type: ConflictType,
pub difficulty: ConflictDifficulty,
pub suggested_strategy: ResolutionStrategy,
pub context: String,
}Expand description
Represents a conflict region in a file
Fields§
§file_path: StringFile path where conflict occurs
start_pos: usizeByte position where conflict starts
end_pos: usizeByte position where conflict ends
start_line: usizeLine number where conflict starts
end_line: usizeLine number where conflict ends
our_content: StringContent from “our” side (before separator)
their_content: StringContent from “their” side (after separator)
conflict_type: ConflictTypeType of conflict detected
difficulty: ConflictDifficultyDifficulty level for resolution
suggested_strategy: ResolutionStrategySuggested resolution strategy
context: StringAdditional context or explanation
Trait Implementations§
Source§impl Clone for ConflictRegion
impl Clone for ConflictRegion
Source§fn clone(&self) -> ConflictRegion
fn clone(&self) -> ConflictRegion
Returns a duplicate of the value. Read more
1.0.0 · 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 ConflictRegion
impl Debug for ConflictRegion
Source§impl<'de> Deserialize<'de> for ConflictRegion
impl<'de> Deserialize<'de> for ConflictRegion
Source§fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
Auto Trait Implementations§
impl Freeze for ConflictRegion
impl RefUnwindSafe for ConflictRegion
impl Send for ConflictRegion
impl Sync for ConflictRegion
impl Unpin for ConflictRegion
impl UnwindSafe for ConflictRegion
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
Mutably borrows from an owned value. Read more
Source§impl<T> CloneToUninit for Twhere
T: Clone,
impl<T> CloneToUninit for Twhere
T: Clone,
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>
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