Add a few Debug impls

Author: glandium

helper/libgit.rs

@@ -4,6 +4,7 @@
 
 use std::convert::TryInto;
 use std::ffi::{c_void, CStr, CString, OsStr};
+use std::fmt;
 use std::io::{self, Write};
 use std::os::raw::{c_char, c_int, c_long, c_uint, c_ulong, c_ushort};
 #[cfg(unix)]
@@ -492,36 +493,51 @@ extern "C" {
 
 pub struct FileMode(u16);
 
+impl fmt::Debug for FileMode {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{:06o}", self.0)
+    }
+}
+
+#[derive(Derivative)]
+#[derivative(Debug)]
 pub enum DiffTreeItem {
     Added {
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         path: Box<[u8]>,
         mode: FileMode,
         oid: BlobId,
     },
     Deleted {
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         path: Box<[u8]>,
         mode: FileMode,
         oid: BlobId,
     },
     Modified {
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         path: Box<[u8]>,
         from_mode: FileMode,
         from_oid: BlobId,
         to_mode: FileMode,
         to_oid: BlobId,
     },
     Renamed {
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         to_path: Box<[u8]>,
         to_mode: FileMode,
         to_oid: BlobId,
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         from_path: Box<[u8]>,
         from_mode: FileMode,
         from_oid: BlobId,
     },
     Copied {
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         to_path: Box<[u8]>,
         to_mode: FileMode,
         to_oid: BlobId,
+        #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
         from_path: Box<[u8]>,
         from_mode: FileMode,
         from_oid: BlobId,

helper/util.rs

@@ -5,6 +5,7 @@
 use std::borrow::ToOwned;
 use std::cmp::Ordering;
 use std::convert::TryInto;
+use std::fmt;
 use std::io::{self, copy, Cursor, LineWriter, Read, Seek, SeekFrom, Write};
 use std::mem;
 #[cfg(unix)]
@@ -516,3 +517,7 @@ fn test_ordered_zip() {
         Some(Err(UnorderedError(())))
     );
 }
+
+pub fn bstr_fmt<S: AsRef<[u8]>>(s: &S, f: &mut fmt::Formatter) -> fmt::Result {
+    fmt::Debug::fmt(s.as_ref().as_bstr(), f)
+}

helper/xdiff.rs

@@ -7,7 +7,7 @@ use std::ffi::c_void;
 use std::marker::PhantomData;
 use std::os::raw::{c_char, c_int, c_long, c_ulong};
 
-use bstr::{BStr, ByteSlice};
+use bstr::ByteSlice;
 
 #[allow(non_camel_case_types)]
 #[repr(C)]
@@ -67,11 +67,13 @@ extern "C" {
     ) -> c_int;
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Derivative, PartialEq)]
+#[derivative(Debug)]
 pub struct PatchInfo<'a> {
     pub start: usize,
     pub end: usize,
-    pub data: &'a BStr,
+    #[derivative(Debug(format_with = "crate::util::bstr_fmt"))]
+    pub data: &'a [u8],
 }
 
 struct HunkContext<'a> {