# HG changeset patch # User Martin von Zweigbergk # Date 2019-12-11 17:39:14 # Node ID 4b3c8df189bc196c80b54d6b6856be4582d6ed27 # Parent 68af0228fedcd609a2ab57d54497c5585452a7fc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} The default prints the vector of bytes as a list of integers. I considered instead getting rid of the Debug trait, but we use the Debug format in lots of derived Debug instances, so we probably do want to implement it. Differential Revision: https://phab.mercurial-scm.org/D7604 diff --git a/rust/hg-core/src/utils/hg_path.rs b/rust/hg-core/src/utils/hg_path.rs --- a/rust/hg-core/src/utils/hg_path.rs +++ b/rust/hg-core/src/utils/hg_path.rs @@ -77,7 +77,7 @@ impl From for std::io::Erro // `#[repr(transparent)]`. // Anyway, `Slice` representation and layout are considered implementation // detail, are not documented and must not be relied upon. -#[derive(Eq, Ord, PartialEq, PartialOrd, Debug, Hash)] +#[derive(Eq, Ord, PartialEq, PartialOrd, Hash)] pub struct HgPath { inner: [u8], } @@ -181,13 +181,19 @@ impl HgPath { } } +impl fmt::Debug for HgPath { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "HgPath({:?})", String::from_utf8_lossy(&self.inner)) + } +} + impl fmt::Display for HgPath { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", String::from_utf8_lossy(&self.inner)) } } -#[derive(Eq, Ord, Clone, PartialEq, PartialOrd, Debug, Hash)] +#[derive(Eq, Ord, Clone, PartialEq, PartialOrd, Hash)] pub struct HgPathBuf { inner: Vec, } @@ -210,6 +216,12 @@ impl HgPathBuf { } } +impl fmt::Debug for HgPathBuf { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "HgPathBuf({:?})", String::from_utf8_lossy(&self.inner)) + } +} + impl fmt::Display for HgPathBuf { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", String::from_utf8_lossy(&self.inner))