Struct ConflictRegion 

pub struct ConflictRegion {
    pub id: String,
    pub path: String,
    pub symbol: Option<String>,
    pub occurrence: u32,
    pub merged_range: ConflictRange,
    pub base: ConflictSide,
    pub ours: ConflictSide,
    pub theirs: ConflictSide,
}

One independently addressable conflict region in a file.

Fields

id: String

Deterministic BLAKE3 address derived from the anchor and three hunk hashes.

path: String

symbol: Option<String>

Stable semantic address when the source language can be parsed.

occurrence: u32

Disambiguates byte-identical conflicts under the same anchor.

merged_range: ConflictRange

Range occupied by the rendered marker block.

base: ConflictSide

ours: ConflictSide

theirs: ConflictSide

Implementations

impl ConflictRegion

pub fn new( path: impl Into<String>, symbol: Option<String>, occurrence: u32, merged_range: ConflictRange, base: ConflictSide, ours: ConflictSide, theirs: ConflictSide, ) -> Result<Self, ConflictError>

pub fn validate(&self) -> Result<(), ConflictError>

Trait Implementations

impl Clone for ConflictRegion

fn clone(&self) -> ConflictRegion

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for ConflictRegion

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictRegion

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for ConflictRegion

impl PartialEq for ConflictRegion

fn eq(&self, other: &ConflictRegion) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl Serialize for ConflictRegion

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl StructuralPartialEq for ConflictRegion