Merge pull request #143 from scalexm/wf-debug

Correctly implement `Debug` for `FromEnv` and `WellFormed`

Author: leoyvens

src/ir.rs

@@ -619,7 +619,7 @@ pub struct Derefs {
     pub target: Ty,
 }
 
-#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
+#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum WellFormed {
     /// A predicate which is true is some trait ref is well-formed.
     /// For example, given the following trait definitions:
@@ -646,7 +646,7 @@ pub enum WellFormed {
     Ty(Ty),
 }
 
-#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
+#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum FromEnv {
     /// A predicate which enables deriving everything which should be true if we *know* that
     /// some trait ref is well-formed. For example given the above trait definitions, we can use

src/ir/debug.rs

@@ -184,6 +184,24 @@ impl Debug for WhereClause {
     }
 }
 
+impl Debug for FromEnv {
+    fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
+        match self {
+            FromEnv::Trait(t) => write!(fmt, "FromEnv({:?})", t),
+            FromEnv::Ty(t) => write!(fmt, "FromEnv({:?})", t),
+        }
+    }
+}
+
+impl Debug for WellFormed {
+    fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
+        match self {
+            WellFormed::Trait(t) => write!(fmt, "WellFormed({:?})", t),
+            WellFormed::Ty(t) => write!(fmt, "WellFormed({:?})", t),
+        }
+    }
+}
+
 impl Debug for DomainGoal {
     fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
         match self {