fix minor rebase artifacts

Author: nikomatsakis

src/librustc/ty/fold.rs

@@ -674,12 +674,11 @@ impl LateBoundRegionsCollector {
 }
 
 impl<'tcx> TypeVisitor<'tcx> for LateBoundRegionsCollector {
-    fn enter_region_binder(&mut self) {
+    fn visit_binder<T: TypeFoldable<'tcx>>(&mut self, t: &Binder<T>) -> bool {
         self.current_depth += 1;
-    }
-
-    fn exit_region_binder(&mut self) {
+        let r = t.super_visit_with(self);
         self.current_depth -= 1;
+        r
     }
 
     fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {

src/librustc_typeck/astconv.rs

@@ -53,8 +53,10 @@ use middle::const_val::ConstVal;
 use rustc_const_eval::{eval_const_expr_partial, ConstEvalErr};
 use rustc_const_eval::EvalHint::UncheckedExprHint;
 use rustc_const_eval::ErrKind::ErroneousReferencedConstant;
+use hir;
 use hir::def::{self, Def};
 use hir::def_id::DefId;
+use hir::print as pprust;
 use middle::resolve_lifetime as rl;
 use rustc::ty::subst::{FnSpace, TypeSpace, SelfSpace, Subst, Substs, ParamSpace};
 use rustc::traits;
@@ -67,8 +69,6 @@ use rscope::{self, UnelidableRscope, RegionScope, ElidableRscope,
 use rustc::lint;
 use rustc_back::slice;
 use rustc_const_math::ConstInt;
-use rustc_front::print::pprust;
-use rustc_front::hir;
 use syntax::{abi, ast};
 use syntax::codemap::{Span, Pos};
 use syntax::errors::DiagnosticBuilder;