move 2 candidates into builtin candidate

[rust.git] / compiler / rustc_middle / src / traits / structural_impls.rs

diff --git a/compiler/rustc_middle/src/traits/structural_impls.rs b/compiler/rustc_middle/src/traits/structural_impls.rs
index 7fbd57ac7354aa2691dfec008de1a25618e355ea..6acb7745d654e9552b8adc86c4a61418957c40d0 100644 (file)
--- a/compiler/rustc_middle/src/traits/structural_impls.rs
+++ b/compiler/rustc_middle/src/traits/structural_impls.rs
@@ -15,11 +15,9 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 
             super::ImplSource::Generator(ref d) => write!(f, "{:?}", d),
 
-            super::ImplSource::FnPointer(ref d) => write!(f, "({:?})", d),
-
-            super::ImplSource::DiscriminantKind(ref d) => write!(f, "{:?}", d),
+            super::ImplSource::Future(ref d) => write!(f, "{:?}", d),
 
-            super::ImplSource::Pointee(ref d) => write!(f, "{:?}", d),
+            super::ImplSource::FnPointer(ref d) => write!(f, "({:?})", d),
 
             super::ImplSource::Object(ref d) => write!(f, "{:?}", d),
 
@@ -58,6 +56,16 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     }
 }
 
+impl<'tcx, N: fmt::Debug> fmt::Debug for traits::ImplSourceFutureData<'tcx, N> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "ImplSourceFutureData(generator_def_id={:?}, substs={:?}, nested={:?})",
+            self.generator_def_id, self.substs, self.nested
+        )
+    }
+}
+
 impl<'tcx, N: fmt::Debug> fmt::Debug for traits::ImplSourceClosureData<'tcx, N> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
@@ -125,11 +133,3 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "ImplSourceConstDestructData(nested={:?})", self.nested)
     }
 }
-
-///////////////////////////////////////////////////////////////////////////
-// Lift implementations
-
-TrivialTypeTraversalAndLiftImpls! {
-    super::ImplSourceDiscriminantKindData,
-    super::ImplSourcePointeeData,
-}