use crate::utils::ptr::get_spans;
-use crate::utils::sym;
use crate::utils::{
- get_trait_def_id, implements_trait, in_macro_or_desugar, is_copy, is_self, match_type, multispan_sugg, paths,
+ get_trait_def_id, implements_trait, is_copy, is_self, is_type_diagnostic_item, match_type, multispan_sugg, paths,
snippet, snippet_opt, span_lint_and_then,
};
use if_chain::if_chain;
use std::borrow::Cow;
use syntax::ast::Attribute;
use syntax::errors::DiagnosticBuilder;
-use syntax_pos::Span;
+use syntax_pos::{Span, Symbol};
declare_clippy_lint! {
/// **What it does:** Checks for functions taking arguments by value, but not
/// fn foo(v: Vec<i32>) {
/// assert_eq!(v.len(), 42);
/// }
+ /// ```
+ ///
+ /// ```rust
/// // should be
/// fn foo(v: &[i32]) {
/// assert_eq!(v.len(), 42);
span: Span,
hir_id: HirId,
) {
- if in_macro_or_desugar(span) {
+ if span.from_expansion() {
return;
}
}
// Exclude non-inherent impls
- if let Some(Node::Item(item)) = cx
- .tcx
- .hir()
- .find_by_hir_id(cx.tcx.hir().get_parent_node_by_hir_id(hir_id))
- {
+ if let Some(Node::Item(item)) = cx.tcx.hir().find(cx.tcx.hir().get_parent_node(hir_id)) {
if matches!(item.node, ItemKind::Impl(_, _, _, _, Some(_), _, _) |
ItemKind::Trait(..))
{
}
// Allow `Borrow` or functions to be taken by value
- let borrow_trait = need!(get_trait_def_id(cx, &*paths::BORROW_TRAIT));
+ let borrow_trait = need!(get_trait_def_id(cx, &paths::BORROW_TRAIT));
let whitelisted_traits = [
need!(cx.tcx.lang_items().fn_trait()),
need!(cx.tcx.lang_items().fn_once_trait()),
need!(cx.tcx.lang_items().fn_mut_trait()),
- need!(get_trait_def_id(cx, &*paths::RANGE_ARGUMENT_TRAIT)),
+ need!(get_trait_def_id(cx, &paths::RANGE_ARGUMENT_TRAIT)),
];
let sized_trait = need!(cx.tcx.lang_items().sized_trait());
- let fn_def_id = cx.tcx.hir().local_def_id_from_hir_id(hir_id);
+ let fn_def_id = cx.tcx.hir().local_def_id(hir_id);
let preds = traits::elaborate_predicates(cx.tcx, cx.param_env.caller_bounds.to_vec())
.filter(|p| !p.is_global())
} = {
let mut ctx = MovedVariablesCtxt::new(cx);
let region_scope_tree = &cx.tcx.region_scope_tree(fn_def_id);
- euv::ExprUseVisitor::new(&mut ctx, cx.tcx, cx.param_env, region_scope_tree, cx.tables, None)
- .consume_body(body);
+ euv::ExprUseVisitor::new(
+ &mut ctx,
+ cx.tcx,
+ fn_def_id,
+ cx.param_env,
+ region_scope_tree,
+ cx.tables,
+ None,
+ )
+ .consume_body(body);
ctx
};
let fn_sig = cx.tcx.fn_sig(fn_def_id);
let fn_sig = cx.tcx.erase_late_bound_regions(&fn_sig);
- for (idx, ((input, &ty), arg)) in decl.inputs.iter().zip(fn_sig.inputs()).zip(&body.arguments).enumerate() {
+ for (idx, ((input, &ty), arg)) in decl.inputs.iter().zip(fn_sig.inputs()).zip(&body.params).enumerate() {
// All spans generated from a proc-macro invocation are the same...
if span == input.span {
return;
if_chain! {
if !is_self(arg);
- if !ty.is_mutable_pointer();
+ if !ty.is_mutable_ptr();
if !is_copy(cx, ty);
if !whitelisted_traits.iter().any(|&t| implements_trait(cx, ty, t, &[]));
if !implements_borrow_trait;
let deref_span = spans_need_deref.get(&canonical_id);
if_chain! {
- if match_type(cx, ty, &*paths::VEC);
+ if is_type_diagnostic_item(cx, ty, Symbol::intern("vec_type"));
if let Some(clone_spans) =
- get_spans(cx, Some(body.id()), idx, &[(*sym::clone, ".to_owned()")]);
+ get_spans(cx, Some(body.id()), idx, &[("clone", ".to_owned()")]);
if let TyKind::Path(QPath::Resolved(_, ref path)) = input.node;
if let Some(elem_ty) = path.segments.iter()
- .find(|seg| seg.ident.name == *sym::Vec)
+ .find(|seg| seg.ident.name == sym!(Vec))
.and_then(|ps| ps.args.as_ref())
.map(|params| params.args.iter().find_map(|arg| match arg {
GenericArg::Type(ty) => Some(ty),
}
}
- if match_type(cx, ty, &*paths::STRING) {
+ if match_type(cx, ty, &paths::STRING) {
if let Some(clone_spans) =
- get_spans(cx, Some(body.id()), idx, &[(*sym::clone, ".to_string()"), (*sym::as_str, "")]) {
+ get_spans(cx, Some(body.id()), idx, &[("clone", ".to_string()"), ("as_str", "")]) {
db.span_suggestion(
input.span,
"consider changing the type to",
/// Functions marked with these attributes must have the exact signature.
fn requires_exact_signature(attrs: &[Attribute]) -> bool {
attrs.iter().any(|attr| {
- [*sym::proc_macro, *sym::proc_macro_attribute, *sym::proc_macro_derive]
+ [sym!(proc_macro), sym!(proc_macro_attribute), sym!(proc_macro_derive)]
.iter()
.any(|&allow| attr.check_name(allow))
})
}
-struct MovedVariablesCtxt<'a, 'tcx: 'a> {
+struct MovedVariablesCtxt<'a, 'tcx> {
cx: &'a LateContext<'a, 'tcx>,
moved_vars: FxHashSet<HirId>,
/// Spans which need to be prefixed with `*` for dereferencing the
if let mc::Categorization::Local(vid) = cmt.cat {
let mut id = matched_pat.hir_id;
loop {
- let parent = self.cx.tcx.hir().get_parent_node_by_hir_id(id);
+ let parent = self.cx.tcx.hir().get_parent_node(id);
if id == parent {
// no parent
return;
}
id = parent;
- if let Some(node) = self.cx.tcx.hir().find_by_hir_id(id) {
+ if let Some(node) = self.cx.tcx.hir().find(id) {
match node {
Node::Expr(e) => {
// `match` and `if let`