Struct PatchConflict 

pub struct PatchConflict {
    pub hunk_index: usize,
    pub expected_line: String,
    pub actual_line: String,
    pub line_number: usize,
    pub conflict_type: ConflictType,
}

A detected conflict when validating a patch against file content.

Fields

hunk_index: usize

Index of the hunk that conflicts.

expected_line: String

The line content the patch expected to find.

actual_line: String

The line content actually present in the file.

line_number: usize

The line number (1-based) in the original where the conflict was found.

conflict_type: ConflictType

What kind of conflict was detected.

Trait Implementations

impl Clone for PatchConflict

fn clone(&self) -> PatchConflict

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for PatchConflict

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for PatchConflict

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Serialize for PatchConflict

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

where __S: Serializer,

Serialize this value into the given Serde serializer.