Auto merge of #30696 - steveklabnik:gh30655, r=brson

[rust.git] / src / librustc / middle / implicator.rs

diff --git a/src/librustc/middle/implicator.rs b/src/librustc/middle/implicator.rs
index b1a4e0270c2f9dd0da892d829eccd9d5b9c50d6f..d25084bbdffb5e5794cc0840f0c4cf9d7b4750e9 100644 (file)
--- a/src/librustc/middle/implicator.rs
+++ b/src/librustc/middle/implicator.rs
@@ -14,8 +14,8 @@
 use middle::infer::{InferCtxt, GenericKind};
 use middle::subst::Substs;
 use middle::traits;
-use middle::ty::{self, RegionEscape, ToPredicate, Ty};
-use middle::ty_fold::{TypeFoldable, TypeFolder};
+use middle::ty::{self, ToPredicate, Ty};
+use middle::ty::fold::{TypeFoldable, TypeFolder};
 
 use syntax::ast;
 use syntax::codemap::Span;
@@ -404,7 +404,7 @@ fn accumulate_from_object_ty(&mut self,
     }
 
     fn fully_normalize<T>(&self, value: &T) -> Result<T,ErrorReported>
-        where T : TypeFoldable<'tcx> + ty::HasTypeFlags
+        where T : TypeFoldable<'tcx>
     {
         let value =
             traits::fully_normalize(self.infcx,