diff --git a/clippy_lints/src/panic_unimplemented.rs b/clippy_lints/src/panic_unimplemented.rs index bee1ec46f553e..8327dbcc641b1 100644 --- a/clippy_lints/src/panic_unimplemented.rs +++ b/clippy_lints/src/panic_unimplemented.rs @@ -1,10 +1,10 @@ use crate::utils::{is_direct_expn_of, is_expn_of, match_def_path, paths, resolve_node, span_lint}; use if_chain::if_chain; +use rustc::hir::ptr::P; use rustc::hir::*; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::{declare_lint_pass, declare_tool_lint}; use syntax::ast::LitKind; -use syntax::ptr::P; use syntax_pos::Span; declare_clippy_lint! { diff --git a/clippy_lints/src/question_mark.rs b/clippy_lints/src/question_mark.rs index 9e0f7d0f3c2e1..7e3453e260c4d 100644 --- a/clippy_lints/src/question_mark.rs +++ b/clippy_lints/src/question_mark.rs @@ -1,10 +1,10 @@ use if_chain::if_chain; use rustc::hir::def::{DefKind, Res}; +use rustc::hir::ptr::P; use rustc::hir::*; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::{declare_lint_pass, declare_tool_lint}; use rustc_errors::Applicability; -use syntax::ptr::P; use crate::utils::paths::*; use crate::utils::sugg::Sugg; diff --git a/clippy_lints/src/redundant_pattern_matching.rs b/clippy_lints/src/redundant_pattern_matching.rs index a178db3132300..ce33ebf87ba65 100644 --- a/clippy_lints/src/redundant_pattern_matching.rs +++ b/clippy_lints/src/redundant_pattern_matching.rs @@ -1,10 +1,10 @@ use crate::utils::{match_qpath, paths, snippet, span_lint_and_then}; +use rustc::hir::ptr::P; use rustc::hir::*; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::{declare_lint_pass, declare_tool_lint}; use rustc_errors::Applicability; use syntax::ast::LitKind; -use syntax::ptr::P; declare_clippy_lint! { /// **What it does:** Lint for redundant pattern matching over `Result` or diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs index 3a54c5d0a02c9..5b2d24a7cb347 100644 --- a/clippy_lints/src/utils/hir_utils.rs +++ b/clippy_lints/src/utils/hir_utils.rs @@ -1,12 +1,12 @@ use crate::consts::{constant_context, constant_simple}; use crate::utils::differing_macro_contexts; +use rustc::hir::ptr::P; use rustc::hir::*; use rustc::lint::LateContext; use rustc::ty::TypeckTables; use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; use syntax::ast::Name; -use syntax::ptr::P; /// Type used to check whether two ast are the same. This is different from the /// operator