-use reexport::*;
+use crate::reexport::*;
+use matches::matches;
use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
use rustc::hir::def::Def;
use rustc::hir::*;
-use rustc::hir::intravisit::{Visitor, walk_ty, walk_ty_param_bound, walk_fn_decl, walk_generics, NestedVisitorMap};
-use std::collections::{HashSet, HashMap};
+use rustc::hir::intravisit::*;
+use std::collections::{HashMap, HashSet};
use syntax::codemap::Span;
-use utils::{in_external_macro, span_lint, last_path_segment};
+use crate::utils::{in_external_macro, last_path_segment, span_lint};
use syntax::symbol::keywords;
/// **What it does:** Checks for lifetime annotations which can be removed by
/// ```rust
/// fn in_and_out<'a>(x: &'a u8, y: u8) -> &'a u8 { x }
/// ```
-declare_lint! {
+declare_clippy_lint! {
pub NEEDLESS_LIFETIMES,
- Warn,
+ complexity,
"using explicit lifetimes for references in function arguments when elision rules \
would allow omitting them"
}
/// ```rust
/// fn unused_lifetime<'a>(x: u8) { .. }
/// ```
-declare_lint! {
- pub UNUSED_LIFETIMES,
- Warn,
+declare_clippy_lint! {
+ pub EXTRA_UNUSED_LIFETIMES,
+ complexity,
"unused lifetimes in function definitions"
}
-#[derive(Copy,Clone)]
+#[derive(Copy, Clone)]
pub struct LifetimePass;
impl LintPass for LifetimePass {
fn get_lints(&self) -> LintArray {
- lint_array!(NEEDLESS_LIFETIMES, UNUSED_LIFETIMES)
+ lint_array!(NEEDLESS_LIFETIMES, EXTRA_UNUSED_LIFETIMES)
}
}
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LifetimePass {
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item) {
- if let ItemFn(ref decl, _, _, _, ref generics, id) = item.node {
+ if let ItemKind::Fn(ref decl, _, ref generics, id) = item.node {
check_fn_inner(cx, decl, Some(id), generics, item.span);
}
}
fn check_impl_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx ImplItem) {
if let ImplItemKind::Method(ref sig, id) = item.node {
- check_fn_inner(cx, &sig.decl, Some(id), &sig.generics, item.span);
+ check_fn_inner(cx, &sig.decl, Some(id), &item.generics, item.span);
}
}
TraitMethod::Required(_) => None,
TraitMethod::Provided(id) => Some(id),
};
- check_fn_inner(cx, &sig.decl, body, &sig.generics, item.span);
+ check_fn_inner(cx, &sig.decl, body, &item.generics, item.span);
}
}
}
Named(Name),
}
-fn check_fn_inner<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, decl: &'tcx FnDecl, body: Option<BodyId>, generics: &'tcx Generics, span: Span) {
+fn check_fn_inner<'a, 'tcx>(
+ cx: &LateContext<'a, 'tcx>,
+ decl: &'tcx FnDecl,
+ body: Option<BodyId>,
+ generics: &'tcx Generics,
+ span: Span,
+) {
if in_external_macro(cx, span) || has_where_lifetimes(cx, &generics.where_clause) {
return;
}
let mut bounds_lts = Vec::new();
- for typ in &generics.ty_params {
+ let types = generics.params.iter().filter_map(|param| match param.kind {
+ GenericParamKind::Type { .. } => Some(param),
+ GenericParamKind::Lifetime { .. } => None,
+ });
+ for typ in types {
for bound in &typ.bounds {
- if let TraitTyParamBound(ref trait_ref, _) = *bound {
- let bounds = trait_ref.trait_ref
+ let mut visitor = RefVisitor::new(cx);
+ walk_param_bound(&mut visitor, bound);
+ if visitor.lts.iter().any(|lt| matches!(lt, RefLt::Named(_))) {
+ return;
+ }
+ if let GenericBound::Trait(ref trait_ref, _) = *bound {
+ let params = &trait_ref
+ .trait_ref
.path
.segments
.last()
.expect("a path must have at least one segment")
- .parameters
- .lifetimes();
- for bound in bounds {
- if bound.name != "'static" && !bound.is_elided() {
- return;
+ .args;
+ if let Some(ref params) = *params {
+ let lifetimes = params.args.iter().filter_map(|arg| match arg {
+ GenericArg::Lifetime(lt) => Some(lt),
+ GenericArg::Type(_) => None,
+ });
+ for bound in lifetimes {
+ if bound.name != LifetimeName::Static && !bound.is_elided() {
+ return;
+ }
+ bounds_lts.push(bound);
}
- bounds_lts.push(bound);
}
}
}
}
- if could_use_elision(cx, decl, body, &generics.lifetimes, bounds_lts) {
- span_lint(cx,
- NEEDLESS_LIFETIMES,
- span,
- "explicit lifetimes given in parameter types where they could be elided");
+ if could_use_elision(cx, decl, body, &generics.params, bounds_lts) {
+ span_lint(
+ cx,
+ NEEDLESS_LIFETIMES,
+ span,
+ "explicit lifetimes given in parameter types where they could be elided",
+ );
}
report_extra_lifetimes(cx, decl, generics);
}
cx: &LateContext<'a, 'tcx>,
func: &'tcx FnDecl,
body: Option<BodyId>,
- named_lts: &'tcx [LifetimeDef],
+ named_generics: &'tcx [GenericParam],
bounds_lts: Vec<&'tcx Lifetime>,
) -> bool {
// There are two scenarios where elision works:
// level of the current item.
// check named LTs
- let allowed_lts = allowed_lts_from(named_lts);
+ let allowed_lts = allowed_lts_from(named_generics);
// these will collect all the lifetimes for references in arg/return types
let mut input_visitor = RefVisitor::new(cx);
};
if let Some(body_id) = body {
- let mut checker = BodyLifetimeChecker { lifetimes_used_in_body: false };
+ let mut checker = BodyLifetimeChecker {
+ lifetimes_used_in_body: false,
+ };
checker.visit_expr(&cx.tcx.hir.body(body_id).value);
if checker.lifetimes_used_in_body {
return false;
// no output lifetimes, check distinctness of input lifetimes
// only unnamed and static, ok
- if input_lts.iter().all(|lt| *lt == RefLt::Unnamed || *lt == RefLt::Static) {
+ let unnamed_and_static = input_lts
+ .iter()
+ .all(|lt| *lt == RefLt::Unnamed || *lt == RefLt::Static);
+ if unnamed_and_static {
return false;
}
// we have no output reference, so we only need all distinct lifetimes
match (&input_lts[0], &output_lts[0]) {
(&RefLt::Named(n1), &RefLt::Named(n2)) if n1 == n2 => true,
(&RefLt::Named(_), &RefLt::Unnamed) => true,
- _ => false, // already elided, different named lifetimes
- // or something static going on
+ _ => false, /* already elided, different named lifetimes
+ * or something static going on */
}
} else {
false
}
}
-fn allowed_lts_from(named_lts: &[LifetimeDef]) -> HashSet<RefLt> {
+fn allowed_lts_from(named_generics: &[GenericParam]) -> HashSet<RefLt> {
let mut allowed_lts = HashSet::new();
- for lt in named_lts {
- if lt.bounds.is_empty() {
- allowed_lts.insert(RefLt::Named(lt.lifetime.name));
+ for par in named_generics.iter() {
+ if let GenericParamKind::Lifetime { .. } = par.kind {
+ if par.bounds.is_empty() {
+ allowed_lts.insert(RefLt::Named(par.name.ident().name));
+ }
}
}
allowed_lts.insert(RefLt::Unnamed);
fn lts_from_bounds<'a, T: Iterator<Item = &'a Lifetime>>(mut vec: Vec<RefLt>, bounds_lts: T) -> Vec<RefLt> {
for lt in bounds_lts {
- if lt.name != "'static" {
- vec.push(RefLt::Named(lt.name));
+ if lt.name != LifetimeName::Static {
+ vec.push(RefLt::Named(lt.name.ident().name));
}
}
}
impl<'v, 't> RefVisitor<'v, 't> {
- fn new(cx: &'v LateContext<'v, 't>) -> RefVisitor<'v, 't> {
- RefVisitor {
- cx: cx,
+ fn new(cx: &'v LateContext<'v, 't>) -> Self {
+ Self {
+ cx,
lts: Vec::new(),
abort: false,
}
fn record(&mut self, lifetime: &Option<Lifetime>) {
if let Some(ref lt) = *lifetime {
- if lt.name == "'static" {
+ if lt.name == LifetimeName::Static {
self.lts.push(RefLt::Static);
} else if lt.is_elided() {
self.lts.push(RefLt::Unnamed);
} else {
- self.lts.push(RefLt::Named(lt.name));
+ self.lts.push(RefLt::Named(lt.name.ident().name));
}
} else {
self.lts.push(RefLt::Unnamed);
}
fn collect_anonymous_lifetimes(&mut self, qpath: &QPath, ty: &Ty) {
- let last_path_segment = &last_path_segment(qpath).parameters;
- if let AngleBracketedParameters(ref params) = *last_path_segment {
- if params.lifetimes.is_empty() {
- match self.cx.tables.qpath_def(qpath, ty.id) {
- Def::TyAlias(def_id) |
- Def::Struct(def_id) => {
- let generics = self.cx.tcx.item_generics(def_id);
- for _ in generics.regions.as_slice() {
+ if let Some(ref last_path_segment) = last_path_segment(qpath).args {
+ if !last_path_segment.parenthesized
+ && !last_path_segment.args.iter().any(|arg| match arg {
+ GenericArg::Lifetime(_) => true,
+ GenericArg::Type(_) => false,
+ }) {
+ let hir_id = self.cx.tcx.hir.node_to_hir_id(ty.id);
+ match self.cx.tables.qpath_def(qpath, hir_id) {
+ Def::TyAlias(def_id) | Def::Struct(def_id) => {
+ let generics = self.cx.tcx.generics_of(def_id);
+ for _ in generics.params.as_slice() {
self.record(&None);
}
},
Def::Trait(def_id) => {
- let trait_def = self.cx.tcx.maps.trait_def.borrow()[&def_id];
- for _ in &self.cx.tcx.item_generics(trait_def.def_id).regions {
+ let trait_def = self.cx.tcx.trait_def(def_id);
+ for _ in &self.cx.tcx.generics_of(trait_def.def_id).params {
self.record(&None);
}
},
fn visit_ty(&mut self, ty: &'tcx Ty) {
match ty.node {
- TyRptr(ref lt, _) if lt.is_elided() => {
+ TyKind::Rptr(ref lt, _) if lt.is_elided() => {
self.record(&None);
},
- TyPath(ref path) => {
- self.collect_anonymous_lifetimes(path, ty);
- },
- TyImplTrait(ref param_bounds) => {
- for bound in param_bounds {
- if let RegionTyParamBound(_) = *bound {
- self.record(&None);
+ TyKind::Path(ref path) => {
+ if let QPath::Resolved(_, ref path) = *path {
+ if let Def::Existential(def_id) = path.def {
+ let node_id = self.cx.tcx.hir.as_local_node_id(def_id).unwrap();
+ if let ItemKind::Existential(ref exist_ty) = self.cx.tcx.hir.expect_item(node_id).node {
+ for bound in &exist_ty.bounds {
+ if let GenericBound::Outlives(_) = *bound {
+ self.record(&None);
+ }
+ }
+ } else {
+ unreachable!()
+ }
+ walk_ty(self, ty);
+ return;
}
}
- },
- TyTraitObject(ref bounds, ref lt) => {
+ self.collect_anonymous_lifetimes(path, ty);
+ }
+ TyKind::TraitObject(ref bounds, ref lt) => {
if !lt.is_elided() {
self.abort = true;
}
return true;
}
// if the bounds define new lifetimes, they are fine to occur
- let allowed_lts = allowed_lts_from(&pred.bound_lifetimes);
+ let allowed_lts = allowed_lts_from(&pred.bound_generic_params);
// now walk the bounds
for bound in pred.bounds.iter() {
- walk_ty_param_bound(&mut visitor, bound);
+ walk_param_bound(&mut visitor, bound);
}
// and check that all lifetimes are allowed
match visitor.into_vec() {
impl<'tcx> Visitor<'tcx> for LifetimeChecker {
// for lifetimes as parameters of generics
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
- self.map.remove(&lifetime.name);
+ self.map.remove(&lifetime.name.ident().name);
}
- fn visit_lifetime_def(&mut self, _: &'tcx LifetimeDef) {
+ fn visit_generic_param(&mut self, param: &'tcx GenericParam) {
// don't actually visit `<'a>` or `<'a: 'b>`
// we've already visited the `'a` declarations and
// don't want to spuriously remove them
// `'b` in `'a: 'b` is useless unless used elsewhere in
// a non-lifetime bound
+ if let GenericParamKind::Type { .. } = param.kind {
+ walk_generic_param(self, param)
+ }
}
fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
NestedVisitorMap::None
}
fn report_extra_lifetimes<'a, 'tcx: 'a>(cx: &LateContext<'a, 'tcx>, func: &'tcx FnDecl, generics: &'tcx Generics) {
- let hs = generics.lifetimes
- .iter()
- .map(|lt| (lt.lifetime.name, lt.lifetime.span))
+ let hs = generics.params.iter()
+ .filter_map(|par| match par.kind {
+ GenericParamKind::Lifetime { .. } => Some((par.name.ident().name, par.span)),
+ _ => None,
+ })
.collect();
let mut checker = LifetimeChecker { map: hs };
walk_fn_decl(&mut checker, func);
for &v in checker.map.values() {
- span_lint(cx, UNUSED_LIFETIMES, v, "this lifetime isn't used in the function definition");
+ span_lint(cx, EXTRA_UNUSED_LIFETIMES, v, "this lifetime isn't used in the function definition");
}
}
impl<'tcx> Visitor<'tcx> for BodyLifetimeChecker {
// for lifetimes as parameters of generics
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
- if lifetime.name != keywords::Invalid.name() && lifetime.name != "'static" {
+ if lifetime.name.ident().name != keywords::Invalid.name() && lifetime.name.ident().name != "'static" {
self.lifetimes_used_in_body = true;
}
}
projects / rust.git / blobdiff