Make output more compact when pretty printing vars

Author: wezm

fathom/src/core/pretty.rs

@@ -119,9 +119,9 @@ impl<'interner, 'arena> Context<'interner> {
         // FIXME: indentation and grouping
 
         match term {
-            Term::ItemVar(_, level) => RcDoc::text(format!("ItemVar({:?})", level)),
-            Term::LocalVar(_, index) => RcDoc::text(format!("LocalVar({:?})", index)),
-            Term::MetaVar(_, index) => RcDoc::text(format!("MetaVar({:?})", index)),
+            Term::ItemVar(_, level) => RcDoc::text(format!("Item({})", level)),
+            Term::LocalVar(_, index) => RcDoc::text(format!("Local({})", index)),
+            Term::MetaVar(_, index) => RcDoc::text(format!("Meta({})", index)),
             Term::InsertedMeta(_, level, info) => {
                 RcDoc::text(format!("InsertedMeta({:?}, {:?})", level, info))
             }

fathom/src/env.rs

@@ -64,6 +64,12 @@ impl fmt::Debug for Index {
     }
 }
 
+impl fmt::Display for Index {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 /// An iterator over indices, listed from the most recently bound.
 pub fn indices() -> impl Iterator<Item = Index> {
     (0..).map(Index)
@@ -105,6 +111,12 @@ impl fmt::Debug for Level {
     }
 }
 
+impl fmt::Display for Level {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 /// An iterator over levels, listed from the least recently bound.
 pub fn levels() -> impl Iterator<Item = Level> {
     (0..).map(Level)