diff options
Diffstat (limited to 'clippy_lints/src/utils')
| -rwxr-xr-x | clippy_lints/src/utils/ast_utils.rs | 526 | ||||
| -rw-r--r-- | clippy_lints/src/utils/hir_utils.rs | 10 | ||||
| -rw-r--r-- | clippy_lints/src/utils/mod.rs | 64 | ||||
| -rw-r--r-- | clippy_lints/src/utils/paths.rs | 1 |
4 files changed, 563 insertions, 38 deletions
diff --git a/clippy_lints/src/utils/ast_utils.rs b/clippy_lints/src/utils/ast_utils.rs new file mode 100755 index 00000000000..dcf09da198e --- /dev/null +++ b/clippy_lints/src/utils/ast_utils.rs @@ -0,0 +1,526 @@ +//! Utilities for manipulating and extracting information from `rustc_ast::ast`. +//! +//! - The `eq_foobar` functions test for semantic equality but ignores `NodeId`s and `Span`s. + +#![allow(clippy::similar_names, clippy::wildcard_imports, clippy::enum_glob_use)] + +use crate::utils::{both, over}; +use rustc_ast::ast::{self, *}; +use rustc_ast::ptr::P; +use rustc_span::symbol::Ident; +use std::mem; + +/// Checks if each element in the first slice is contained within the latter as per `eq_fn`. +pub fn unordered_over<X>(left: &[X], right: &[X], mut eq_fn: impl FnMut(&X, &X) -> bool) -> bool { + left.len() == right.len() && left.iter().all(|l| right.iter().any(|r| eq_fn(l, r))) +} + +pub fn eq_id(l: Ident, r: Ident) -> bool { + l.name == r.name +} + +pub fn eq_pat(l: &Pat, r: &Pat) -> bool { + use PatKind::*; + match (&l.kind, &r.kind) { + (Paren(l), _) => eq_pat(l, r), + (_, Paren(r)) => eq_pat(l, r), + (Wild, Wild) | (Rest, Rest) => true, + (Lit(l), Lit(r)) => eq_expr(l, r), + (Ident(b1, i1, s1), Ident(b2, i2, s2)) => b1 == b2 && eq_id(*i1, *i2) && both(s1, s2, |l, r| eq_pat(l, r)), + (Range(lf, lt, le), Range(rf, rt, re)) => { + eq_expr_opt(lf, rf) && eq_expr_opt(lt, rt) && eq_range_end(&le.node, &re.node) + }, + (Box(l), Box(r)) + | (Ref(l, Mutability::Not), Ref(r, Mutability::Not)) + | (Ref(l, Mutability::Mut), Ref(r, Mutability::Mut)) => eq_pat(l, r), + (Tuple(l), Tuple(r)) | (Slice(l), Slice(r)) => over(l, r, |l, r| eq_pat(l, r)), + (Path(lq, lp), Path(rq, rp)) => both(lq, rq, |l, r| eq_qself(l, r)) && eq_path(lp, rp), + (TupleStruct(lp, lfs), TupleStruct(rp, rfs)) => eq_path(lp, rp) && over(lfs, rfs, |l, r| eq_pat(l, r)), + (Struct(lp, lfs, lr), Struct(rp, rfs, rr)) => { + lr == rr && eq_path(lp, rp) && unordered_over(lfs, rfs, |lf, rf| eq_field_pat(lf, rf)) + }, + (Or(ls), Or(rs)) => unordered_over(ls, rs, |l, r| eq_pat(l, r)), + (MacCall(l), MacCall(r)) => eq_mac_call(l, r), + _ => false, + } +} + +pub fn eq_range_end(l: &RangeEnd, r: &RangeEnd) -> bool { + match (l, r) { + (RangeEnd::Excluded, RangeEnd::Excluded) => true, + (RangeEnd::Included(l), RangeEnd::Included(r)) => { + matches!(l, RangeSyntax::DotDotEq) == matches!(r, RangeSyntax::DotDotEq) + }, + _ => false, + } +} + +pub fn eq_field_pat(l: &FieldPat, r: &FieldPat) -> bool { + l.is_placeholder == r.is_placeholder + && eq_id(l.ident, r.ident) + && eq_pat(&l.pat, &r.pat) + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) +} + +pub fn eq_qself(l: &QSelf, r: &QSelf) -> bool { + l.position == r.position && eq_ty(&l.ty, &r.ty) +} + +pub fn eq_path(l: &Path, r: &Path) -> bool { + over(&l.segments, &r.segments, |l, r| eq_path_seg(l, r)) +} + +pub fn eq_path_seg(l: &PathSegment, r: &PathSegment) -> bool { + eq_id(l.ident, r.ident) && both(&l.args, &r.args, |l, r| eq_generic_args(l, r)) +} + +pub fn eq_generic_args(l: &GenericArgs, r: &GenericArgs) -> bool { + match (l, r) { + (GenericArgs::AngleBracketed(l), GenericArgs::AngleBracketed(r)) => { + over(&l.args, &r.args, |l, r| eq_angle_arg(l, r)) + }, + (GenericArgs::Parenthesized(l), GenericArgs::Parenthesized(r)) => { + over(&l.inputs, &r.inputs, |l, r| eq_ty(l, r)) && eq_fn_ret_ty(&l.output, &r.output) + }, + _ => false, + } +} + +pub fn eq_angle_arg(l: &AngleBracketedArg, r: &AngleBracketedArg) -> bool { + match (l, r) { + (AngleBracketedArg::Arg(l), AngleBracketedArg::Arg(r)) => eq_generic_arg(l, r), + (AngleBracketedArg::Constraint(l), AngleBracketedArg::Constraint(r)) => eq_assoc_constraint(l, r), + _ => false, + } +} + +pub fn eq_generic_arg(l: &GenericArg, r: &GenericArg) -> bool { + match (l, r) { + (GenericArg::Lifetime(l), GenericArg::Lifetime(r)) => eq_id(l.ident, r.ident), + (GenericArg::Type(l), GenericArg::Type(r)) => eq_ty(l, r), + (GenericArg::Const(l), GenericArg::Const(r)) => eq_expr(&l.value, &r.value), + _ => false, + } +} + +pub fn eq_expr_opt(l: &Option<P<Expr>>, r: &Option<P<Expr>>) -> bool { + both(l, r, |l, r| eq_expr(l, r)) +} + +pub fn eq_expr(l: &Expr, r: &Expr) -> bool { + use ExprKind::*; + if !over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) { + return false; + } + match (&l.kind, &r.kind) { + (Paren(l), _) => eq_expr(l, r), + (_, Paren(r)) => eq_expr(l, r), + (Err, Err) => true, + (Box(l), Box(r)) | (Try(l), Try(r)) | (Await(l), Await(r)) => eq_expr(l, r), + (Array(l), Array(r)) | (Tup(l), Tup(r)) => over(l, r, |l, r| eq_expr(l, r)), + (Repeat(le, ls), Repeat(re, rs)) => eq_expr(le, re) && eq_expr(&ls.value, &rs.value), + (Call(lc, la), Call(rc, ra)) => eq_expr(lc, rc) && over(la, ra, |l, r| eq_expr(l, r)), + (MethodCall(lc, la), MethodCall(rc, ra)) => eq_path_seg(lc, rc) && over(la, ra, |l, r| eq_expr(l, r)), + (Binary(lo, ll, lr), Binary(ro, rl, rr)) => lo.node == ro.node && eq_expr(ll, rl) && eq_expr(lr, rr), + (Unary(lo, l), Unary(ro, r)) => mem::discriminant(lo) == mem::discriminant(ro) && eq_expr(l, r), + (Lit(l), Lit(r)) => l.kind == r.kind, + (Cast(l, lt), Cast(r, rt)) | (Type(l, lt), Type(r, rt)) => eq_expr(l, r) && eq_ty(lt, rt), + (Let(lp, le), Let(rp, re)) => eq_pat(lp, rp) && eq_expr(le, re), + (If(lc, lt, le), If(rc, rt, re)) => eq_expr(lc, rc) && eq_block(lt, rt) && eq_expr_opt(le, re), + (While(lc, lt, ll), While(rc, rt, rl)) => eq_label(ll, rl) && eq_expr(lc, rc) && eq_block(lt, rt), + (ForLoop(lp, li, lt, ll), ForLoop(rp, ri, rt, rl)) => { + eq_label(ll, rl) && eq_pat(lp, rp) && eq_expr(li, ri) && eq_block(lt, rt) + }, + (Loop(lt, ll), Loop(rt, rl)) => eq_label(ll, rl) && eq_block(lt, rt), + (Block(lb, ll), Block(rb, rl)) => eq_label(ll, rl) && eq_block(lb, rb), + (TryBlock(l), TryBlock(r)) => eq_block(l, r), + (Yield(l), Yield(r)) | (Ret(l), Ret(r)) => eq_expr_opt(l, r), + (Break(ll, le), Break(rl, re)) => eq_label(ll, rl) && eq_expr_opt(le, re), + (Continue(ll), Continue(rl)) => eq_label(ll, rl), + (Assign(l1, l2, _), Assign(r1, r2, _)) | (Index(l1, l2), Index(r1, r2)) => eq_expr(l1, r1) && eq_expr(l2, r2), + (AssignOp(lo, lp, lv), AssignOp(ro, rp, rv)) => lo.node == ro.node && eq_expr(lp, rp) && eq_expr(lv, rv), + (Field(lp, lf), Field(rp, rf)) => eq_id(*lf, *rf) && eq_expr(lp, rp), + (Match(ls, la), Match(rs, ra)) => eq_expr(ls, rs) && over(la, ra, |l, r| eq_arm(l, r)), + (Closure(lc, la, lm, lf, lb, _), Closure(rc, ra, rm, rf, rb, _)) => { + lc == rc && la.is_async() == ra.is_async() && lm == rm && eq_fn_decl(lf, rf) && eq_expr(lb, rb) + }, + (Async(lc, _, lb), Async(rc, _, rb)) => lc == rc && eq_block(lb, rb), + (Range(lf, lt, ll), Range(rf, rt, rl)) => ll == rl && eq_expr_opt(lf, rf) && eq_expr_opt(lt, rt), + (AddrOf(lbk, lm, le), AddrOf(rbk, rm, re)) => lbk == rbk && lm == rm && eq_expr(le, re), + (Path(lq, lp), Path(rq, rp)) => both(lq, rq, |l, r| eq_qself(l, r)) && eq_path(lp, rp), + (MacCall(l), MacCall(r)) => eq_mac_call(l, r), + (Struct(lp, lfs, lb), Struct(rp, rfs, rb)) => { + eq_path(lp, rp) && eq_expr_opt(lb, rb) && unordered_over(lfs, rfs, |l, r| eq_field(l, r)) + }, + _ => false, + } +} + +pub fn eq_field(l: &Field, r: &Field) -> bool { + l.is_placeholder == r.is_placeholder + && eq_id(l.ident, r.ident) + && eq_expr(&l.expr, &r.expr) + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) +} + +pub fn eq_arm(l: &Arm, r: &Arm) -> bool { + l.is_placeholder == r.is_placeholder + && eq_pat(&l.pat, &r.pat) + && eq_expr(&l.body, &r.body) + && eq_expr_opt(&l.guard, &r.guard) + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) +} + +pub fn eq_label(l: &Option<Label>, r: &Option<Label>) -> bool { + both(l, r, |l, r| eq_id(l.ident, r.ident)) +} + +pub fn eq_block(l: &Block, r: &Block) -> bool { + l.rules == r.rules && over(&l.stmts, &r.stmts, |l, r| eq_stmt(l, r)) +} + +pub fn eq_stmt(l: &Stmt, r: &Stmt) -> bool { + use StmtKind::*; + match (&l.kind, &r.kind) { + (Local(l), Local(r)) => { + eq_pat(&l.pat, &r.pat) + && both(&l.ty, &r.ty, |l, r| eq_ty(l, r)) + && eq_expr_opt(&l.init, &r.init) + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) + }, + (Item(l), Item(r)) => eq_item(l, r, eq_item_kind), + (Expr(l), Expr(r)) | (Semi(l), Semi(r)) => eq_expr(l, r), + (Empty, Empty) => true, + (MacCall(l), MacCall(r)) => l.1 == r.1 && eq_mac_call(&l.0, &r.0) && over(&l.2, &r.2, |l, r| eq_attr(l, r)), + _ => false, + } +} + +pub fn eq_item<K>(l: &Item<K>, r: &Item<K>, mut eq_kind: impl FnMut(&K, &K) -> bool) -> bool { + eq_id(l.ident, r.ident) + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) + && eq_vis(&l.vis, &r.vis) + && eq_kind(&l.kind, &r.kind) +} + +pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool { + use ItemKind::*; + match (l, r) { + (ExternCrate(l), ExternCrate(r)) => l == r, + (Use(l), Use(r)) => eq_use_tree(l, r), + (Static(lt, lm, le), Static(rt, rm, re)) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re), + (Const(ld, lt, le), Const(rd, rt, re)) => eq_defaultness(*ld, *rd) && eq_ty(lt, rt) && eq_expr_opt(le, re), + (Fn(ld, lf, lg, lb), Fn(rd, rf, rg, rb)) => { + eq_defaultness(*ld, *rd) && eq_fn_sig(lf, rf) && eq_generics(lg, rg) && both(lb, rb, |l, r| eq_block(l, r)) + }, + (Mod(l), Mod(r)) => l.inline == r.inline && over(&l.items, &r.items, |l, r| eq_item(l, r, eq_item_kind)), + (ForeignMod(l), ForeignMod(r)) => { + both(&l.abi, &r.abi, |l, r| eq_str_lit(l, r)) + && over(&l.items, &r.items, |l, r| eq_item(l, r, eq_foreign_item_kind)) + }, + (TyAlias(ld, lg, lb, lt), TyAlias(rd, rg, rb, rt)) => { + eq_defaultness(*ld, *rd) + && eq_generics(lg, rg) + && over(lb, rb, |l, r| eq_generic_bound(l, r)) + && both(lt, rt, |l, r| eq_ty(l, r)) + }, + (Enum(le, lg), Enum(re, rg)) => { + over(&le.variants, &re.variants, |l, r| eq_variant(l, r)) && eq_generics(lg, rg) + }, + (Struct(lv, lg), Struct(rv, rg)) | (Union(lv, lg), Union(rv, rg)) => { + eq_variant_data(lv, rv) && eq_generics(lg, rg) + }, + (Trait(la, lu, lg, lb, li), Trait(ra, ru, rg, rb, ri)) => { + la == ra + && matches!(lu, Unsafe::No) == matches!(ru, Unsafe::No) + && eq_generics(lg, rg) + && over(lb, rb, |l, r| eq_generic_bound(l, r)) + && over(li, ri, |l, r| eq_item(l, r, eq_assoc_item_kind)) + }, + (TraitAlias(lg, lb), TraitAlias(rg, rb)) => eq_generics(lg, rg) && over(lb, rb, |l, r| eq_generic_bound(l, r)), + ( + Impl { + unsafety: lu, + polarity: lp, + defaultness: ld, + constness: lc, + generics: lg, + of_trait: lot, + self_ty: lst, + items: li, + }, + Impl { + unsafety: ru, + polarity: rp, + defaultness: rd, + constness: rc, + generics: rg, + of_trait: rot, + self_ty: rst, + items: ri, + }, + ) => { + matches!(lu, Unsafe::No) == matches!(ru, Unsafe::No) + && matches!(lp, ImplPolarity::Positive) == matches!(rp, ImplPolarity::Positive) + && eq_defaultness(*ld, *rd) + && matches!(lc, ast::Const::No) == matches!(rc, ast::Const::No) + && eq_generics(lg, rg) + && both(lot, rot, |l, r| eq_path(&l.path, &r.path)) + && eq_ty(lst, rst) + && over(li, ri, |l, r| eq_item(l, r, eq_assoc_item_kind)) + }, + (MacCall(l), MacCall(r)) => eq_mac_call(l, r), + (MacroDef(l), MacroDef(r)) => l.macro_rules == r.macro_rules && eq_mac_args(&l.body, &r.body), + _ => false, + } +} + +pub fn eq_foreign_item_kind(l: &ForeignItemKind, r: &ForeignItemKind) -> bool { + use ForeignItemKind::*; + match (l, r) { + (Static(lt, lm, le), Static(rt, rm, re)) => lm == rm && eq_ty(lt, rt) && eq_expr_opt(le, re), + (Fn(ld, lf, lg, lb), Fn(rd, rf, rg, rb)) => { + eq_defaultness(*ld, *rd) && eq_fn_sig(lf, rf) && eq_generics(lg, rg) && both(lb, rb, |l, r| eq_block(l, r)) + }, + (TyAlias(ld, lg, lb, lt), TyAlias(rd, rg, rb, rt)) => { + eq_defaultness(*ld, *rd) + && eq_generics(lg, rg) + && over(lb, rb, |l, r| eq_generic_bound(l, r)) + && both(lt, rt, |l, r| eq_ty(l, r)) + }, + (MacCall(l), MacCall(r)) => eq_mac_call(l, r), + _ => false, + } +} + +pub fn eq_assoc_item_kind(l: &AssocItemKind, r: &AssocItemKind) -> bool { + use AssocItemKind::*; + match (l, r) { + (Const(ld, lt, le), Const(rd, rt, re)) => eq_defaultness(*ld, *rd) && eq_ty(lt, rt) && eq_expr_opt(le, re), + (Fn(ld, lf, lg, lb), Fn(rd, rf, rg, rb)) => { + eq_defaultness(*ld, *rd) && eq_fn_sig(lf, rf) && eq_generics(lg, rg) && both(lb, rb, |l, r| eq_block(l, r)) + }, + (TyAlias(ld, lg, lb, lt), TyAlias(rd, rg, rb, rt)) => { + eq_defaultness(*ld, *rd) + && eq_generics(lg, rg) + && over(lb, rb, |l, r| eq_generic_bound(l, r)) + && both(lt, rt, |l, r| eq_ty(l, r)) + }, + (MacCall(l), MacCall(r)) => eq_mac_call(l, r), + _ => false, + } +} + +pub fn eq_variant(l: &Variant, r: &Variant) -> bool { + l.is_placeholder == r.is_placeholder + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) + && eq_vis(&l.vis, &r.vis) + && eq_id(l.ident, r.ident) + && eq_variant_data(&l.data, &r.data) + && both(&l.disr_expr, &r.disr_expr, |l, r| eq_expr(&l.value, &r.value)) +} + +pub fn eq_variant_data(l: &VariantData, r: &VariantData) -> bool { + use VariantData::*; + match (l, r) { + (Unit(_), Unit(_)) => true, + (Struct(l, _), Struct(r, _)) | (Tuple(l, _), Tuple(r, _)) => over(l, r, |l, r| eq_struct_field(l, r)), + _ => false, + } +} + +pub fn eq_struct_field(l: &StructField, r: &StructField) -> bool { + l.is_placeholder == r.is_placeholder + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) + && eq_vis(&l.vis, &r.vis) + && both(&l.ident, &r.ident, |l, r| eq_id(*l, *r)) + && eq_ty(&l.ty, &r.ty) +} + +pub fn eq_fn_sig(l: &FnSig, r: &FnSig) -> bool { + eq_fn_decl(&l.decl, &r.decl) && eq_fn_header(&l.header, &r.header) +} + +pub fn eq_fn_header(l: &FnHeader, r: &FnHeader) -> bool { + matches!(l.unsafety, Unsafe::No) == matches!(r.unsafety, Unsafe::No) + && l.asyncness.is_async() == r.asyncness.is_async() + && matches!(l.constness, Const::No) == matches!(r.constness, Const::No) + && eq_ext(&l.ext, &r.ext) +} + +pub fn eq_generics(l: &Generics, r: &Generics) -> bool { + over(&l.params, &r.params, |l, r| eq_generic_param(l, r)) + && over(&l.where_clause.predicates, &r.where_clause.predicates, |l, r| { + eq_where_predicate(l, r) + }) +} + +pub fn eq_where_predicate(l: &WherePredicate, r: &WherePredicate) -> bool { + use WherePredicate::*; + match (l, r) { + (BoundPredicate(l), BoundPredicate(r)) => { + over(&l.bound_generic_params, &r.bound_generic_params, |l, r| { + eq_generic_param(l, r) + }) && eq_ty(&l.bounded_ty, &r.bounded_ty) + && over(&l.bounds, &r.bounds, |l, r| eq_generic_bound(l, r)) + }, + (RegionPredicate(l), RegionPredicate(r)) => { + eq_id(l.lifetime.ident, r.lifetime.ident) && over(&l.bounds, &r.bounds, |l, r| eq_generic_bound(l, r)) + }, + (EqPredicate(l), EqPredicate(r)) => eq_ty(&l.lhs_ty, &r.lhs_ty) && eq_ty(&l.rhs_ty, &r.rhs_ty), + _ => false, + } +} + +pub fn eq_use_tree(l: &UseTree, r: &UseTree) -> bool { + eq_path(&l.prefix, &r.prefix) && eq_use_tree_kind(&l.kind, &r.kind) +} + +pub fn eq_use_tree_kind(l: &UseTreeKind, r: &UseTreeKind) -> bool { + use UseTreeKind::*; + match (l, r) { + (Glob, Glob) => true, + (Simple(l, _, _), Simple(r, _, _)) => both(l, r, |l, r| eq_id(*l, *r)), + (Nested(l), Nested(r)) => over(l, r, |(l, _), (r, _)| eq_use_tree(l, r)), + _ => false, + } +} + +pub fn eq_defaultness(l: Defaultness, r: Defaultness) -> bool { + match (l, r) { + (Defaultness::Final, Defaultness::Final) | (Defaultness::Default(_), Defaultness::Default(_)) => true, + _ => false, + } +} + +pub fn eq_vis(l: &Visibility, r: &Visibility) -> bool { + use VisibilityKind::*; + match (&l.node, &r.node) { + (Public, Public) | (Inherited, Inherited) | (Crate(_), Crate(_)) => true, + (Restricted { path: l, .. }, Restricted { path: r, .. }) => eq_path(l, r), + _ => false, + } +} + +pub fn eq_fn_decl(l: &FnDecl, r: &FnDecl) -> bool { + eq_fn_ret_ty(&l.output, &r.output) + && over(&l.inputs, &r.inputs, |l, r| { + l.is_placeholder == r.is_placeholder + && eq_pat(&l.pat, &r.pat) + && eq_ty(&l.ty, &r.ty) + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) + }) +} + +pub fn eq_fn_ret_ty(l: &FnRetTy, r: &FnRetTy) -> bool { + match (l, r) { + (FnRetTy::Default(_), FnRetTy::Default(_)) => true, + (FnRetTy::Ty(l), FnRetTy::Ty(r)) => eq_ty(l, r), + _ => false, + } +} + +pub fn eq_ty(l: &Ty, r: &Ty) -> bool { + use TyKind::*; + match (&l.kind, &r.kind) { + (Paren(l), _) => eq_ty(l, r), + (_, Paren(r)) => eq_ty(l, r), + (Never, Never) | (Infer, Infer) | (ImplicitSelf, ImplicitSelf) | (Err, Err) | (CVarArgs, CVarArgs) => true, + (Slice(l), Slice(r)) => eq_ty(l, r), + (Array(le, ls), Array(re, rs)) => eq_ty(le, re) && eq_expr(&ls.value, &rs.value), + (Ptr(l), Ptr(r)) => l.mutbl == r.mutbl && eq_ty(&l.ty, &r.ty), + (Rptr(ll, l), Rptr(rl, r)) => { + both(ll, rl, |l, r| eq_id(l.ident, r.ident)) && l.mutbl == r.mutbl && eq_ty(&l.ty, &r.ty) + }, + (BareFn(l), BareFn(r)) => { + l.unsafety == r.unsafety + && eq_ext(&l.ext, &r.ext) + && over(&l.generic_params, &r.generic_params, |l, r| eq_generic_param(l, r)) + && eq_fn_decl(&l.decl, &r.decl) + }, + (Tup(l), Tup(r)) => over(l, r, |l, r| eq_ty(l, r)), + (Path(lq, lp), Path(rq, rp)) => both(lq, rq, |l, r| eq_qself(l, r)) && eq_path(lp, rp), + (TraitObject(lg, ls), TraitObject(rg, rs)) => ls == rs && over(lg, rg, |l, r| eq_generic_bound(l, r)), + (ImplTrait(_, lg), ImplTrait(_, rg)) => over(lg, rg, |l, r| eq_generic_bound(l, r)), + (Typeof(l), Typeof(r)) => eq_expr(&l.value, &r.value), + (MacCall(l), MacCall(r)) => eq_mac_call(l, r), + _ => false, + } +} + +pub fn eq_ext(l: &Extern, r: &Extern) -> bool { + use Extern::*; + match (l, r) { + (None, None) | (Implicit, Implicit) => true, + (Explicit(l), Explicit(r)) => eq_str_lit(l, r), + _ => false, + } +} + +pub fn eq_str_lit(l: &StrLit, r: &StrLit) -> bool { + l.style == r.style && l.symbol == r.symbol && l.suffix == r.suffix +} + +pub fn eq_poly_ref_trait(l: &PolyTraitRef, r: &PolyTraitRef) -> bool { + eq_path(&l.trait_ref.path, &r.trait_ref.path) + && over(&l.bound_generic_params, &r.bound_generic_params, |l, r| { + eq_generic_param(l, r) + }) +} + +pub fn eq_generic_param(l: &GenericParam, r: &GenericParam) -> bool { + use GenericParamKind::*; + l.is_placeholder == r.is_placeholder + && eq_id(l.ident, r.ident) + && over(&l.bounds, &r.bounds, |l, r| eq_generic_bound(l, r)) + && match (&l.kind, &r.kind) { + (Lifetime, Lifetime) => true, + (Type { default: l }, Type { default: r }) => both(l, r, |l, r| eq_ty(l, r)), + (Const { ty: l }, Const { ty: r }) => eq_ty(l, r), + _ => false, + } + && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) +} + +pub fn eq_generic_bound(l: &GenericBound, r: &GenericBound) -> bool { + use GenericBound::*; + match (l, r) { + (Trait(ptr1, tbm1), Trait(ptr2, tbm2)) => tbm1 == tbm2 && eq_poly_ref_trait(ptr1, ptr2), + (Outlives(l), Outlives(r)) => eq_id(l.ident, r.ident), + _ => false, + } +} + +pub fn eq_assoc_constraint(l: &AssocTyConstraint, r: &AssocTyConstraint) -> bool { + use AssocTyConstraintKind::*; + eq_id(l.ident, r.ident) + && match (&l.kind, &r.kind) { + (Equality { ty: l }, Equality { ty: r }) => eq_ty(l, r), + (Bound { bounds: l }, Bound { bounds: r }) => over(l, r, |l, r| eq_generic_bound(l, r)), + _ => false, + } +} + +pub fn eq_mac_call(l: &MacCall, r: &MacCall) -> bool { + eq_path(&l.path, &r.path) && eq_mac_args(&l.args, &r.args) +} + +pub fn eq_attr(l: &Attribute, r: &Attribute) -> bool { + use AttrKind::*; + l.style == r.style + && match (&l.kind, &r.kind) { + (DocComment(l), DocComment(r)) => l == r, + (Normal(l), Normal(r)) => eq_path(&l.path, &r.path) && eq_mac_args(&l.args, &r.args), + _ => false, + } +} + +pub fn eq_mac_args(l: &MacArgs, r: &MacArgs) -> bool { + use MacArgs::*; + match (l, r) { + (Empty, Empty) => true, + (Delimited(_, ld, lts), Delimited(_, rd, rts)) => ld == rd && lts.eq_unspanned(rts), + (Eq(_, lts), Eq(_, rts)) => lts.eq_unspanned(rts), + _ => false, + } +} diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs index 92c27e79452..f8d197c15e8 100644 --- a/clippy_lints/src/utils/hir_utils.rs +++ b/clippy_lints/src/utils/hir_utils.rs @@ -332,19 +332,13 @@ fn swap_binop<'a>( /// Checks if the two `Option`s are both `None` or some equal values as per /// `eq_fn`. -fn both<X, F>(l: &Option<X>, r: &Option<X>, mut eq_fn: F) -> bool -where - F: FnMut(&X, &X) -> bool, -{ +pub fn both<X>(l: &Option<X>, r: &Option<X>, mut eq_fn: impl FnMut(&X, &X) -> bool) -> bool { l.as_ref() .map_or_else(|| r.is_none(), |x| r.as_ref().map_or(false, |y| eq_fn(x, y))) } /// Checks if two slices are equal as per `eq_fn`. -fn over<X, F>(left: &[X], right: &[X], mut eq_fn: F) -> bool -where - F: FnMut(&X, &X) -> bool, -{ +pub fn over<X>(left: &[X], right: &[X], mut eq_fn: impl FnMut(&X, &X) -> bool) -> bool { left.len() == right.len() && left.iter().zip(right).all(|(x, y)| eq_fn(x, y)) } diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 6dd8fef7e82..7b59917c2bb 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -1,6 +1,8 @@ #[macro_use] pub mod sym; +#[allow(clippy::module_name_repetitions)] +pub mod ast_utils; pub mod attrs; pub mod author; pub mod camel_case; @@ -19,7 +21,7 @@ pub mod sugg; pub mod usage; pub use self::attrs::*; pub use self::diagnostics::*; -pub use self::hir_utils::{SpanlessEq, SpanlessHash}; +pub use self::hir_utils::{both, over, SpanlessEq, SpanlessHash}; use std::borrow::Cow; use std::mem; @@ -40,7 +42,7 @@ use rustc_hir::{ use rustc_infer::infer::TyCtxtInferExt; use rustc_lint::{LateContext, Level, Lint, LintContext}; use rustc_middle::hir::map::Map; -use rustc_middle::ty::{self, layout::IntegerExt, subst::GenericArg, Binder, Ty, TyCtxt, TypeFoldable}; +use rustc_middle::ty::{self, layout::IntegerExt, subst::GenericArg, Ty, TyCtxt, TypeFoldable}; use rustc_span::hygiene::{ExpnKind, MacroKind}; use rustc_span::source_map::original_sp; use rustc_span::symbol::{self, kw, Symbol}; @@ -72,7 +74,7 @@ pub fn in_constant(cx: &LateContext<'_, '_>, id: HirId) -> bool { let parent_id = cx.tcx.hir().get_parent_item(id); match cx.tcx.hir().get(parent_id) { Node::Item(&Item { - kind: ItemKind::Const(..), + kind: ItemKind::Const(..) | ItemKind::Static(..), .. }) | Node::TraitItem(&TraitItem { @@ -83,11 +85,7 @@ pub fn in_constant(cx: &LateContext<'_, '_>, id: HirId) -> bool { kind: ImplItemKind::Const(..), .. }) - | Node::AnonConst(_) - | Node::Item(&Item { - kind: ItemKind::Static(..), - .. - }) => true, + | Node::AnonConst(_) => true, Node::Item(&Item { kind: ItemKind::Fn(ref sig, ..), .. @@ -165,8 +163,8 @@ pub fn match_trait_method(cx: &LateContext<'_, '_>, expr: &Expr<'_>, path: &[&st /// Checks if an expression references a variable of the given name. pub fn match_var(expr: &Expr<'_>, var: Name) -> bool { if let ExprKind::Path(QPath::Resolved(None, ref path)) = expr.kind { - if path.segments.len() == 1 && path.segments[0].ident.name == var { - return true; + if let [p] = path.segments { + return p.ident.name == var; } } false @@ -181,8 +179,7 @@ pub fn last_path_segment<'tcx>(path: &QPath<'tcx>) -> &'tcx PathSegment<'tcx> { pub fn single_segment_path<'tcx>(path: &QPath<'tcx>) -> Option<&'tcx PathSegment<'tcx>> { match *path { - QPath::Resolved(_, ref path) if path.segments.len() == 1 => Some(&path.segments[0]), - QPath::Resolved(..) => None, + QPath::Resolved(_, ref path) => path.segments.get(0), QPath::TypeRelative(_, ref seg) => Some(seg), } } @@ -201,9 +198,12 @@ pub fn match_qpath(path: &QPath<'_>, segments: &[&str]) -> bool { QPath::Resolved(_, ref path) => match_path(path, segments), QPath::TypeRelative(ref ty, ref segment) => match ty.kind { TyKind::Path(ref inner_path) => { - !segments.is_empty() - && match_qpath(inner_path, &segments[..(segments.len() - 1)]) - && segment.ident.name.as_str() == segments[segments.len() - 1] + if let [prefix @ .., end] = segments { + if match_qpath(inner_path, prefix) { + return segment.ident.name.as_str() == *end; + } + } + false }, _ => false, }, @@ -398,7 +398,7 @@ pub fn method_calls<'tcx>( /// Matches an `Expr` against a chain of methods, and return the matched `Expr`s. /// /// For example, if `expr` represents the `.baz()` in `foo.bar().baz()`, -/// `matched_method_chain(expr, &["bar", "baz"])` will return a `Vec` +/// `method_chain_args(expr, &["bar", "baz"])` will return a `Vec` /// containing the `Expr`s for /// `.bar()` and `.baz()` pub fn method_chain_args<'a>(expr: &'a Expr<'_>, methods: &[&str]) -> Option<Vec<&'a [Expr<'a>]>> { @@ -882,20 +882,6 @@ pub fn return_ty<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, fn_item: hir::HirId) -> T cx.tcx.erase_late_bound_regions(&ret_ty) } -/// Checks if two types are the same. -/// -/// This discards any lifetime annotations, too. -// -// FIXME: this works correctly for lifetimes bounds (`for <'a> Foo<'a>` == -// `for <'b> Foo<'b>`, but not for type parameters). -pub fn same_tys<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, a: Ty<'tcx>, b: Ty<'tcx>) -> bool { - let a = cx.tcx.erase_late_bound_regions(&Binder::bind(a)); - let b = cx.tcx.erase_late_bound_regions(&Binder::bind(b)); - cx.tcx - .infer_ctxt() - .enter(|infcx| infcx.can_eq(cx.param_env, a, b).is_ok()) -} - /// Returns `true` if the given type is an `unsafe` function. pub fn type_is_unsafe_function<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> bool { match ty.kind { @@ -1408,6 +1394,24 @@ pub fn run_lints(cx: &LateContext<'_, '_>, lints: &[&'static Lint], id: HirId) - }) } +#[macro_export] +macro_rules! unwrap_cargo_metadata { + ($cx: ident, $lint: ident, $deps: expr) => {{ + let mut command = cargo_metadata::MetadataCommand::new(); + if !$deps { + command.no_deps(); + } + + match command.exec() { + Ok(metadata) => metadata, + Err(err) => { + span_lint($cx, $lint, DUMMY_SP, &format!("could not read cargo metadata: {}", err)); + return; + }, + } + }}; +} + #[cfg(test)] mod test { use super::{trim_multiline, without_block_comments}; diff --git a/clippy_lints/src/utils/paths.rs b/clippy_lints/src/utils/paths.rs index 779da7e6bf2..3b7e9739211 100644 --- a/clippy_lints/src/utils/paths.rs +++ b/clippy_lints/src/utils/paths.rs @@ -138,5 +138,6 @@ pub const VEC_AS_SLICE: [&str; 4] = ["alloc", "vec", "Vec", "as_slice"]; pub const VEC_DEQUE: [&str; 4] = ["alloc", "collections", "vec_deque", "VecDeque"]; pub const VEC_FROM_ELEM: [&str; 3] = ["alloc", "vec", "from_elem"]; pub const VEC_NEW: [&str; 4] = ["alloc", "vec", "Vec", "new"]; +pub const VEC_RESIZE: [&str; 4] = ["alloc", "vec", "Vec", "resize"]; pub const WEAK_ARC: [&str; 3] = ["alloc", "sync", "Weak"]; pub const WEAK_RC: [&str; 3] = ["alloc", "rc", "Weak"]; |