rustup rust-lang/rust#67803

Author: matthiaskrgr

clippy_lints/src/escape.rs

@@ -1,10 +1,10 @@
 use rustc::hir::intravisit as visit;
+use rustc::hir::HirIdSet;
 use rustc::hir::{self, *};
 use rustc::impl_lint_pass;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::ty::layout::LayoutOf;
 use rustc::ty::{self, Ty};
-use rustc::util::nodemap::HirIdSet;
 use rustc_session::declare_tool_lint;
 use rustc_span::source_map::Span;
 use rustc_typeck::expr_use_visitor::*;

clippy_lints/src/new_without_default.rs

@@ -4,10 +4,10 @@ use crate::utils::{get_trait_def_id, implements_trait, return_ty, same_tys, span
 use if_chain::if_chain;
 use rustc::hir;
 use rustc::hir::def_id::DefId;
+use rustc::hir::HirIdSet;
 use rustc::impl_lint_pass;
 use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc::ty::{self, Ty};
-use rustc::util::nodemap::HirIdSet;
 use rustc_errors::Applicability;
 use rustc_session::declare_tool_lint;
 use rustc_span::source_map::Span;