Move has_metadata back to context.rs

diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index 85f3d692bbeb7cfab78b3fea49a98665b1a06c1e..220e1e971accd5362f019987f7993b9521e69f47 100644 (file)
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -2040,20 +2040,6 @@ pub fn maybe_walk<F>(&'tcx self, mut f: F)
             }
         }
     }
-
-    pub fn has_metadata<'a>(&'tcx self, tcx: TyCtxt<'a, 'tcx, 'tcx>) -> bool {
-        use syntax_pos::DUMMY_SP;
-        if self.is_sized(tcx, ty::ParamEnv::empty(traits::Reveal::All), DUMMY_SP) {
-            return false;
-        }
-
-        let tail = tcx.struct_tail(self);
-        match tail.sty {
-            ty::TyForeign(..) => false,
-            ty::TyStr | ty::TySlice(..) | ty::TyDynamic(..) => true,
-            _ => bug!("unexpected unsized tail: {:?}", tail.sty),
-        }
-    }
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]

diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs
index f04381aa212be241ade8c39568eb409c7a8def2a..5ecc3fb4ebe3a86cadd9c78bb7151f90003fd09a 100644 (file)
--- a/src/librustc_trans/context.rs
+++ b/src/librustc_trans/context.rs
@@ -324,7 +324,17 @@ pub fn type_is_freeze(&self, ty: Ty<'tcx>) -> bool {
     }
 
     pub fn type_has_metadata(&self, ty: Ty<'tcx>) -> bool {
-        ty.has_metadata(self.tcx)
+        use syntax_pos::DUMMY_SP;
+        if ty.is_sized(self.tcx, ty::ParamEnv::empty(traits::Reveal::All), DUMMY_SP) {
+            return false;
+        }
+
+        let tail = self.tcx.struct_tail(ty);
+        match tail.sty {
+            ty::TyForeign(..) => false,
+            ty::TyStr | ty::TySlice(..) | ty::TyDynamic(..) => true,
+            _ => bug!("unexpected unsized tail: {:?}", tail.sty),
+        }
     }
 
     pub fn tcx(&self) -> TyCtxt<'b, 'tcx, 'tcx> {