Struct ConflictFile 

pub struct ConflictFile { /* private fields */ }

A file with conflict markers, parsed.

use rich_ext::diff::ConflictFile;

let file = ConflictFile::parse("a\n<<<<<<< HEAD\nb\n=======\nc\n>>>>>>> topic\nd\n").unwrap();
let conflict = &file.conflicts()[0];
assert_eq!(conflict.ours.label.as_deref(), Some("HEAD"));
assert_eq!(file.text(&conflict.ours), "b");
assert_eq!(file.text(&conflict.theirs), "c");
assert_eq!((conflict.start_line(), conflict.end_line), (2, 6));

Implementations

impl ConflictFile

pub fn parse(text: &str) -> Result<ConflictFile, ConflictError>

Parse text. Lines may end in \n or \r\n; a leading byte-order mark is dropped. Fails on input over MAX_CONFLICT_SOURCE bytes, more than MAX_CONFLICTS conflicts, markers out of order, and a conflict left open at the end, naming the line.

pub fn lines(&self) -> &[String]

Every line of the file, without terminators.

pub fn conflicts(&self) -> &[Conflict]

The conflicts, in file order.

pub fn has_conflicts(&self) -> bool

Whether the file has any conflict.

pub fn is_crlf(&self) -> bool

Whether any line ended in \r\n.

pub fn text(&self, side: &ConflictSide) -> String

A side’s lines joined with \n (no trailing newline).

Trait Implementations

impl Clone for ConflictFile

fn clone(&self) -> Self

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictFile

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

Formats the value using the given formatter.

impl Eq for ConflictFile

impl PartialEq for ConflictFile

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for ConflictFile