openpgp: Move the hex dumper to conversions::hex.

1 files changed, 1 insertions, 163 deletions

diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index 9032e330..00fab356 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -427,7 +427,7 @@ impl PacketDumper {
             ) as usize;
 
             writeln!(output, "{}", i)?;
-            let mut hd = HexDumper::new(
+            let mut hd = hex::Dumper::new(
                 output,
                 format!("{}  ",
                         &i.chars().take(hd_indent).collect::<String>()));
@@ -580,165 +580,3 @@ impl PacketDumper {
         Ok(())
     }
 }
-
-/// Writes annotated hex dumps, like hd(1).
-///
-/// # Example
-///
-/// ```rust
-/// let mut dumper = HexDumper::new(Vec::new(), "");
-/// dumper.write(&[0x89, 0x01, 0x33], "frame").unwrap();
-/// dumper.write(&[0x04], "version").unwrap();
-/// dumper.write(&[0x00], "sigtype").unwrap();
-/// let buf = dumper.into_inner();
-/// assert_eq!(
-///     ::std::str::from_utf8(&buf[..]).unwrap(),
-///     "00000000  89 01 33                                           frame\n\
-///      00000003           04                                        version\n\
-///      00000004              00                                     sigtype\n\
-///      ");
-/// ```
-pub struct HexDumper<W: io::Write> {
-    inner: W,
-    indent: String,
-    offset: usize,
-}
-
-impl<W: io::Write> HexDumper<W> {
-    /// Creates a new dumper.
-    ///
-    /// The dump is written to `inner`.  Every line is indented with
-    /// `indent`.
-    pub fn new<I: AsRef<str>>(inner: W, indent: I) -> Self {
-        HexDumper {
-            inner: inner,
-            indent: indent.as_ref().into(),
-            offset: 0,
-        }
-    }
-
-    /// Returns the inner writer.
-    pub fn into_inner(self) -> W {
-        self.inner
-    }
-
-    /// Writes a chunk of data.
-    ///
-    /// The `label` is printed at the end of the first line.
-    pub fn write(&mut self, buf: &[u8], msg: &str) -> Result<()> {
-        let mut msg_printed = false;
-        write!(self.inner, "{}{:08x}  ", self.indent, self.offset)?;
-        for i in 0 .. self.offset % 16 {
-            if i != 7 {
-                write!(self.inner, "   ")?;
-            } else {
-                write!(self.inner, "    ")?;
-            }
-        }
-
-        let mut offset_printed = true;
-        for c in buf {
-            if ! offset_printed {
-                write!(self.inner,
-                       "\n{}{:08x}  ", self.indent, self.offset)?;
-                offset_printed = true;
-            }
-
-            write!(self.inner, "{:02x} ", c)?;
-            self.offset += 1;
-            match self.offset % 16 {
-                0 => {
-                    if ! msg_printed {
-                        write!(self.inner, "  {}", msg)?;
-                        msg_printed = true;
-                    }
-                    offset_printed = false;
-                },
-                8 => write!(self.inner, " ")?,
-                _ => (),
-            }
-        }
-
-        if ! msg_printed {
-            for i in self.offset % 16 .. 16 {
-                if i != 7 {
-                    write!(self.inner, "   ")?;
-                } else {
-                    write!(self.inner, "    ")?;
-                }
-            }
-
-            write!(self.inner, "  {}", msg)?;
-        }
-        writeln!(self.inner)?;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn hex_dumper() {
-        let mut dumper = HexDumper::new(Vec::new(), "III");
-        dumper.write(&[0x89, 0x01, 0x33], "frame").unwrap();
-        let buf = dumper.into_inner();
-        assert_eq!(
-            ::std::str::from_utf8(&buf[..]).unwrap(),
-            "III00000000  \
-             89 01 33                                           \
-             frame\n");
-
-        let mut dumper = HexDumper::new(Vec::new(), "III");
-        dumper.write(&[0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01], "frame")
-            .unwrap();
-        let buf = dumper.into_inner();
-        assert_eq!(
-            ::std::str::from_utf8(&buf[..]).unwrap(),
-            "III00000000  \
-             89 01 33 89 01 33 89 01                            \
-             frame\n");
-
-        let mut dumper = HexDumper::new(Vec::new(), "III");
-        dumper.write(&[0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01,
-                       0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01], "frame")
-            .unwrap();
-        let buf = dumper.into_inner();
-        assert_eq!(
-            ::std::str::from_utf8(&buf[..]).unwrap(),
-            "III00000000  \
-             89 01 33 89 01 33 89 01  89 01 33 89 01 33 89 01   \
-             frame\n");
-
-        let mut dumper = HexDumper::new(Vec::new(), "III");
-        dumper.write(&[0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01,
-                       0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01,
-                       0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01,
-                       0x89, 0x01, 0x33, 0x89, 0x01, 0x33, 0x89, 0x01], "frame")
-            .unwrap();
-        let buf = dumper.into_inner();
-        assert_eq!(
-            ::std::str::from_utf8(&buf[..]).unwrap(),
-            "III00000000  \
-             89 01 33 89 01 33 89 01  89 01 33 89 01 33 89 01   \
-             frame\n\
-             III00000010  \
-             89 01 33 89 01 33 89 01  89 01 33 89 01 33 89 01 \n");
-
-        let mut dumper = HexDumper::new(Vec::new(), "");
-        dumper.write(&[0x89, 0x01, 0x33], "frame").unwrap();
-        dumper.write(&[0x04], "version").unwrap();
-        dumper.write(&[0x00], "sigtype").unwrap();
-        let buf = dumper.into_inner();
-        assert_eq!(
-            ::std::str::from_utf8(&buf[..]).unwrap(),
-            "00000000  89 01 33                                           \
-             frame\n\
-             00000003           04                                        \
-             version\n\
-             00000004              00                                     \
-             sigtype\n\
-             ");
-    }
-}