-use std::iter::{range_inclusive, FromIterator, IntoIterator, repeat};
-use std::slice;
-use syntax::ast::{self, DUMMY_NODE_ID, NodeId, Pat};
+use std::iter::{FromIterator, IntoIterator, repeat};
+
+use rustc_front::hir;
+use rustc_front::hir::Pat;
+use rustc_front::visit::{self, Visitor, FnKind};
+use rustc_front::util as front_util;
+use rustc_back::slice;
+
+use syntax::ast::{self, DUMMY_NODE_ID, NodeId};