Struct Conflict 

pub struct Conflict {
    pub patch_a_id: PatchId,
    pub patch_b_id: PatchId,
    pub conflict_addresses: Vec<String>,
}

A conflict between two patches that cannot commute.

A conflict preserves full information from BOTH patches so that a human can resolve it later. Per THM-CONF-001, no data is lost.

Fields

patch_a_id: PatchId

The patch from branch A.

patch_b_id: PatchId

The patch from branch B.

conflict_addresses: Vec<String>

The addresses where both patches touch (the conflict addresses).

Implementations

impl Conflict

pub fn new( patch_a_id: PatchId, patch_b_id: PatchId, conflict_addresses: Vec<String>, ) -> Self

Create a new conflict between two patches.

pub fn classify( &self, patch_a: Option<&Patch>, patch_b: Option<&Patch>, ) -> ConflictClass

Classify this conflict based on patch payloads.

Returns a ConflictClass indicating the severity and potential resolvability.

Trait Implementations

impl Clone for Conflict

fn clone(&self) -> Conflict

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Conflict

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for Conflict

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Serialize for Conflict

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

where __S: Serializer,

Serialize this value into the given Serde serializer.