-use crate::utils::{in_macro, match_trait_method, same_tys, snippet, snippet_with_macro_callsite, span_lint_and_then};
-use crate::utils::{paths, resolve_node};
+use crate::utils::{
+ match_def_path, match_trait_method, paths, same_tys, snippet, snippet_with_macro_callsite, span_lint_and_then,
+};
use rustc::hir::*;
+use rustc::impl_lint_pass;
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_tool_lint, impl_lint_pass};
use rustc_errors::Applicability;
+use rustc_session::declare_tool_lint;
declare_clippy_lint! {
/// **What it does:** Checks for always-identical `Into`/`From`/`IntoIter` conversions.
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for IdentityConversion {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) {
- if in_macro(e.span) {
+ if e.span.from_expansion() {
return;
}
return;
}
- match e.node {
+ match e.kind {
ExprKind::Match(_, ref arms, MatchSource::TryDesugar) => {
- let e = match arms[0].body.node {
+ let e = match arms[0].body.kind {
ExprKind::Ret(Some(ref e)) | ExprKind::Break(_, Some(ref e)) => e,
_ => return,
};
- if let ExprKind::Call(_, ref args) = e.node {
+ if let ExprKind::Call(_, ref args) = e.kind {
self.try_desugar_arm.push(args[0].hir_id);
- } else {
- return;
}
},
ExprKind::MethodCall(ref name, .., ref args) => {
- if match_trait_method(cx, e, &paths::INTO[..]) && &*name.ident.as_str() == "into" {
+ if match_trait_method(cx, e, &paths::INTO) && &*name.ident.as_str() == "into" {
let a = cx.tables.expr_ty(e);
let b = cx.tables.expr_ty(&args[0]);
if same_tys(cx, a, b) {
},
ExprKind::Call(ref path, ref args) => {
- if let ExprKind::Path(ref qpath) = path.node {
- if let Some(def_id) = resolve_node(cx, qpath, path.hir_id).opt_def_id() {
- if cx.match_def_path(def_id, &paths::FROM_FROM[..]) {
+ if let ExprKind::Path(ref qpath) = path.kind {
+ if let Some(def_id) = cx.tables.qpath_res(qpath, path.hir_id).opt_def_id() {
+ if match_def_path(cx, def_id, &paths::FROM_FROM) {
let a = cx.tables.expr_ty(e);
let b = cx.tables.expr_ty(&args[0]);
if same_tys(cx, a, b) {