Auto merge of #4251 - matthiaskrgr:rustup_10, r=Manishearth

rustup rust-lang/rust#61995

changelog: none

Author: bors

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! {

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;

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

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