rustc: use define_print! to implement fmt::{Display,Debug} for Kind.

Author: eddyb

src/librustc/ty/subst.rs

@@ -11,7 +11,6 @@ use smallvec::SmallVec;
 
 use core::intrinsics;
 use std::cmp::Ordering;
-use std::fmt;
 use std::marker::PhantomData;
 use std::mem;
 use std::num::NonZeroUsize;
@@ -99,24 +98,6 @@ impl<'tcx> Kind<'tcx> {
     }
 }
 
-impl<'tcx> fmt::Debug for Kind<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self.unpack() {
-            UnpackedKind::Lifetime(lt) => write!(f, "{:?}", lt),
-            UnpackedKind::Type(ty) => write!(f, "{:?}", ty),
-        }
-    }
-}
-
-impl<'tcx> fmt::Display for Kind<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self.unpack() {
-            UnpackedKind::Lifetime(lt) => write!(f, "{}", lt),
-            UnpackedKind::Type(ty) => write!(f, "{}", ty),
-        }
-    }
-}
-
 impl<'a, 'tcx> Lift<'tcx> for Kind<'a> {
     type Lifted = Kind<'tcx>;
 

src/librustc/util/ppaux.rs

@@ -1,7 +1,7 @@
 use hir::def_id::DefId;
 use hir::map::definitions::DefPathData;
 use middle::region;
-use ty::subst::{Subst, Substs};
+use ty::subst::{Kind, Subst, Substs, UnpackedKind};
 use ty::{BrAnon, BrEnv, BrFresh, BrNamed};
 use ty::{Bool, Char, Adt};
 use ty::{Error, Str, Array, Slice, Float, FnDef, FnPtr};
@@ -1460,3 +1460,20 @@ define_print! {
         }
     }
 }
+
+define_print! {
+    ('tcx) Kind<'tcx>, (self, f, cx) {
+        display {
+            match self.unpack() {
+                UnpackedKind::Lifetime(lt) => print!(f, cx, print(lt)),
+                UnpackedKind::Type(ty) => print!(f, cx, print(ty)),
+            }
+        }
+        debug {
+            match self.unpack() {
+                UnpackedKind::Lifetime(lt) => print!(f, cx, print(lt)),
+                UnpackedKind::Type(ty) => print!(f, cx, print(ty)),
+            }
+        }
+    }
+}