Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / librustc_typeck / coherence / unsafety.rs

diff --git a/src/librustc_typeck/coherence/unsafety.rs b/src/librustc_typeck/coherence/unsafety.rs
index 936d26f9208502195de37c2de0cf30d908605bb4..b042e23e0ac0494104958c0b376b6c327a604845 100644 (file)
--- a/src/librustc_typeck/coherence/unsafety.rs
+++ b/src/librustc_typeck/coherence/unsafety.rs
@@ -11,17 +11,17 @@
 //! Unsafety checker: every impl either implements a trait defined in this
 //! crate or pertains to a type defined in this crate.
 
-use middle::ty;
-use rustc_front::intravisit;
-use rustc_front::hir;
+use rustc::ty::TyCtxt;
+use rustc::hir::intravisit;
+use rustc::hir;
 
-pub fn check(tcx: &ty::ctxt) {
+pub fn check(tcx: &TyCtxt) {
     let mut orphan = UnsafetyChecker { tcx: tcx };
     tcx.map.krate().visit_all_items(&mut orphan);
 }
 
 struct UnsafetyChecker<'cx, 'tcx:'cx> {
-    tcx: &'cx ty::ctxt<'tcx>
+    tcx: &'cx TyCtxt<'tcx>
 }
 
 impl<'cx, 'tcx, 'v> UnsafetyChecker<'cx, 'tcx> {