Replace custom debug with derivative

1 files changed, 8 insertions, 18 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 7a14d3c..08082d8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,4 @@
+use derivative::Derivative;
 use num::bigint::BigInt;
 use num::traits::identities::Zero;
 use rpds::RedBlackTreeMap;
@@ -10,15 +11,21 @@ use std::iter::Iterator;
 
 pub type Intcode = BigInt;
 
-#[derive(Clone)]
+#[derive(Clone, Derivative)]
+#[derivative(Debug)]
 pub struct IntcodeProgram {
+    #[derivative(Debug(format_with = "std::fmt::Display::fmt"))]
     instruction_pointer: Intcode,
+    #[derivative(Debug(format_with = "std::fmt::Display::fmt"))]
     relative_base: Intcode,
     pub error: Option<IntcodeProgramError>,
     pub halted: bool,
     pub awaiting_input: bool,
+    #[derivative(Debug(format_with = "std::fmt::Display::fmt"))]
     memory: RedBlackTreeMap<Intcode, Intcode>,
+    #[derivative(Debug(format_with = "std::fmt::Display::fmt"))]
     pub input: List<Intcode>,
+    #[derivative(Debug(format_with = "std::fmt::Display::fmt"))]
     pub output: Vector<Intcode>,
 }
 
@@ -41,23 +48,6 @@ impl FromIterator<Intcode> for IntcodeProgram {
     }
 }
 
-impl fmt::Debug for IntcodeProgram {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        writeln!(
-            f,
-            "IntcodeProgram {{ \nins: {}, base: {}, error: {:?}, halted: {}, awaiting_input: {} \nmemory: {}, \ninput: {}, \n output: {} \n}}",
-            self.instruction_pointer,
-            self.relative_base,
-            self.error,
-            self.halted,
-            self.awaiting_input,
-            format!("{:?}", self.memory.iter().map(|(k, v)| format!("{} -> {}", k, v)).collect::<Vec<_>>()),
-            format!("{:?}", self.input.iter().map(|n| format!("{}", n)).collect::<Vec<_>>()),
-            format!("{:?}", self.output.iter().map(|n| format!("{}", n)).collect::<Vec<_>>()),
-        )
-    }
-}
-
 pub fn intcode_to_bool(i: &Intcode) -> bool {
     *i != Intcode::from(0)
 }