pub struct ConflictSide {
pub source_state: Option<StateId>,
pub blob_id: Option<Vec<u8>>,
pub range: Option<ConflictRange>,
pub hunk_hash: Vec<u8>,
}Expand description
Provenance and integrity for one side of a three-way conflict.
Mirrors heddle ConflictSide / ConflictSideReport.
Fields§
§source_state: Option<StateId>Physical state this side was taken from.
blob_id: Option<Vec<u8>>Whole-blob ContentHash (32-byte BLAKE3). Absent when the path was
missing in this source state (heddle blob_id: Option<ContentHash>).
range: Option<ConflictRange>Line range within the source blob that contributes this side’s hunk.
hunk_hash: Vec<u8>BLAKE3 of the exact bytes selected by range from the blob (32 bytes).
Integrity pin: verifies the side independently of line shifts.
Implementations§
Trait Implementations§
Source§impl Clone for ConflictSide
impl Clone for ConflictSide
Source§fn clone(&self) -> ConflictSide
fn clone(&self) -> ConflictSide
Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · 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 ConflictSide
impl Debug for ConflictSide
Source§impl Default for ConflictSide
impl Default for ConflictSide
impl Eq for ConflictSide
Source§impl Hash for ConflictSide
impl Hash for ConflictSide
Source§impl Message for ConflictSide
impl Message for ConflictSide
Source§fn encoded_len(&self) -> usize
fn encoded_len(&self) -> usize
Returns the encoded length of the message without a length delimiter.
Source§fn encode(&self, buf: &mut impl BufMut) -> Result<(), EncodeError>where
Self: Sized,
fn encode(&self, buf: &mut impl BufMut) -> Result<(), EncodeError>where
Self: Sized,
Encodes the message to a buffer. Read more
Source§fn encode_to_vec(&self) -> Vec<u8> ⓘwhere
Self: Sized,
fn encode_to_vec(&self) -> Vec<u8> ⓘwhere
Self: Sized,
Encodes the message to a newly allocated buffer.
Source§fn encode_length_delimited(
&self,
buf: &mut impl BufMut,
) -> Result<(), EncodeError>where
Self: Sized,
fn encode_length_delimited(
&self,
buf: &mut impl BufMut,
) -> Result<(), EncodeError>where
Self: Sized,
Encodes the message with a length-delimiter to a buffer. Read more
Source§fn encode_length_delimited_to_vec(&self) -> Vec<u8> ⓘwhere
Self: Sized,
fn encode_length_delimited_to_vec(&self) -> Vec<u8> ⓘwhere
Self: Sized,
Encodes the message with a length-delimiter to a newly allocated buffer.
Source§fn decode(buf: impl Buf) -> Result<Self, DecodeError>where
Self: Default,
fn decode(buf: impl Buf) -> Result<Self, DecodeError>where
Self: Default,
Decodes an instance of the message from a buffer. Read more
Source§fn decode_length_delimited(buf: impl Buf) -> Result<Self, DecodeError>where
Self: Default,
fn decode_length_delimited(buf: impl Buf) -> Result<Self, DecodeError>where
Self: Default,
Decodes a length-delimited instance of the message from the buffer.
Source§fn merge(&mut self, buf: impl Buf) -> Result<(), DecodeError>where
Self: Sized,
fn merge(&mut self, buf: impl Buf) -> Result<(), DecodeError>where
Self: Sized,
Decodes an instance of the message from a buffer, and merges it into
self. Read moreSource§fn merge_length_delimited(&mut self, buf: impl Buf) -> Result<(), DecodeError>where
Self: Sized,
fn merge_length_delimited(&mut self, buf: impl Buf) -> Result<(), DecodeError>where
Self: Sized,
Decodes a length-delimited instance of the message from buffer, and
merges it into
self.Source§impl PartialEq for ConflictSide
impl PartialEq for ConflictSide
impl StructuralPartialEq for ConflictSide
Auto Trait Implementations§
impl Freeze for ConflictSide
impl RefUnwindSafe for ConflictSide
impl Send for ConflictSide
impl Sync for ConflictSide
impl Unpin for ConflictSide
impl UnsafeUnpin for ConflictSide
impl UnwindSafe for ConflictSide
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