use crate::utils::ptr::get_spans;
use crate::utils::{
- 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,
+ get_trait_def_id, implements_trait, is_copy, is_self, is_type_diagnostic_item, multispan_sugg, paths, snippet,
+ snippet_opt, span_lint_and_then,
};
use if_chain::if_chain;
-use matches::matches;
-use rustc::hir::intravisit::FnKind;
-use rustc::hir::*;
-use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::traits;
-use rustc::ty::{self, RegionKind, TypeFoldable};
-use rustc::{declare_lint_pass, declare_tool_lint};
+use rustc_ast::ast::Attribute;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_errors::Applicability;
+use rustc_errors::{Applicability, DiagnosticBuilder};
+use rustc_hir::intravisit::FnKind;
+use rustc_hir::{BindingAnnotation, Body, FnDecl, GenericArg, HirId, ItemKind, Node, PatKind, QPath, TyKind};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_middle::ty::{self, TypeFoldable};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
+use rustc_span::Span;
use rustc_target::spec::abi::Abi;
+use rustc_trait_selection::traits;
+use rustc_trait_selection::traits::misc::can_type_implement_copy;
use rustc_typeck::expr_use_visitor as euv;
use std::borrow::Cow;
-use syntax::ast::Attribute;
-use syntax::errors::DiagnosticBuilder;
-use syntax_pos::{Span, Symbol};
declare_clippy_lint! {
/// **What it does:** Checks for functions taking arguments by value, but not
&mut self,
cx: &LateContext<'a, 'tcx>,
kind: FnKind<'tcx>,
- decl: &'tcx FnDecl,
- body: &'tcx Body,
+ decl: &'tcx FnDecl<'_>,
+ body: &'tcx Body<'_>,
span: Span,
hir_id: HirId,
) {
// Exclude non-inherent impls
if let Some(Node::Item(item)) = cx.tcx.hir().find(cx.tcx.hir().get_parent_node(hir_id)) {
- if matches!(item.kind, ItemKind::Impl(_, _, _, _, Some(_), _, _) |
+ if matches!(item.kind, ItemKind::Impl{ of_trait: Some(_), .. } |
ItemKind::Trait(..))
{
return;
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())
+ let preds = traits::elaborate_predicates(cx.tcx, cx.param_env.caller_bounds.iter().copied())
.filter(|p| !p.is_global())
- .filter_map(|pred| {
- if let ty::Predicate::Trait(poly_trait_ref) = pred {
+ .filter_map(|obligation| {
+ if let ty::Predicate::Trait(poly_trait_ref, _) = obligation.predicate {
if poly_trait_ref.def_id() == sized_trait || poly_trait_ref.skip_binder().has_escaping_bound_vars()
{
return None;
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.params).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;
(
preds.iter().any(|t| t.def_id() == borrow_trait),
- !preds.is_empty()
- && preds.iter().all(|t| {
+ !preds.is_empty() && {
+ let ty_empty_region = cx.tcx.mk_imm_ref(cx.tcx.lifetimes.re_root_empty, ty);
+ preds.iter().all(|t| {
let ty_params = &t
.skip_binder()
.trait_ref
.skip(1)
.cloned()
.collect::<Vec<_>>();
- implements_trait(cx, cx.tcx.mk_imm_ref(&RegionKind::ReEmpty, ty), t.def_id(), ty_params)
- }),
+ implements_trait(cx, ty_empty_region, t.def_id(), ty_params)
+ })
+ },
)
};
}
// Dereference suggestion
- let sugg = |db: &mut DiagnosticBuilder<'_>| {
+ let sugg = |diag: &mut DiagnosticBuilder<'_>| {
if let ty::Adt(def, ..) = ty.kind {
if let Some(span) = cx.tcx.hir().span_if_local(def.did) {
- if cx.param_env.can_type_implement_copy(cx.tcx, ty).is_ok() {
- db.span_help(span, "consider marking this type as Copy");
+ if can_type_implement_copy(cx.tcx, cx.param_env, ty).is_ok() {
+ diag.span_help(span, "consider marking this type as `Copy`");
}
}
}
let deref_span = spans_need_deref.get(&canonical_id);
if_chain! {
- if is_type_diagnostic_item(cx, ty, Symbol::intern("vec_type"));
+ if is_type_diagnostic_item(cx, ty, sym!(vec_type));
if let Some(clone_spans) =
get_spans(cx, Some(body.id()), idx, &[("clone", ".to_owned()")]);
if let TyKind::Path(QPath::Resolved(_, ref path)) = input.kind;
}).unwrap());
then {
let slice_ty = format!("&[{}]", snippet(cx, elem_ty.span, "_"));
- db.span_suggestion(
+ diag.span_suggestion(
input.span,
"consider changing the type to",
slice_ty,
);
for (span, suggestion) in clone_spans {
- db.span_suggestion(
+ diag.span_suggestion(
span,
&snippet_opt(cx, span)
.map_or(
}
}
- if match_type(cx, ty, &paths::STRING) {
+ if is_type_diagnostic_item(cx, ty, sym!(string_type)) {
if let Some(clone_spans) =
get_spans(cx, Some(body.id()), idx, &[("clone", ".to_string()"), ("as_str", "")]) {
- db.span_suggestion(
+ diag.span_suggestion(
input.span,
"consider changing the type to",
"&str".to_string(),
);
for (span, suggestion) in clone_spans {
- db.span_suggestion(
+ diag.span_suggestion(
span,
&snippet_opt(cx, span)
.map_or(
);
spans.sort_by_key(|&(span, _)| span);
}
- multispan_sugg(db, "consider taking a reference instead".to_string(), spans);
+ multispan_sugg(diag, "consider taking a reference instead", spans);
};
span_lint_and_then(
projects / rust.git / blobdiff