2021-03-15 19:55:45 -05:00
|
|
|
use clippy_utils::diagnostics::span_lint;
|
2021-10-29 11:14:22 -05:00
|
|
|
use clippy_utils::trait_ref_of_method;
|
2018-12-29 09:04:45 -06:00
|
|
|
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
2020-02-21 02:39:38 -06:00
|
|
|
use rustc_hir::intravisit::{
|
2020-10-09 05:45:29 -05:00
|
|
|
walk_fn_decl, walk_generic_param, walk_generics, walk_item, walk_param_bound, walk_poly_trait_ref, walk_ty,
|
|
|
|
NestedVisitorMap, Visitor,
|
2020-02-21 02:39:38 -06:00
|
|
|
};
|
2020-02-17 03:36:17 -06:00
|
|
|
use rustc_hir::FnRetTy::Return;
|
2020-02-21 02:39:38 -06:00
|
|
|
use rustc_hir::{
|
2020-10-09 05:45:29 -05:00
|
|
|
BareFnTy, BodyId, FnDecl, GenericArg, GenericBound, GenericParam, GenericParamKind, Generics, ImplItem,
|
2021-03-12 08:30:50 -06:00
|
|
|
ImplItemKind, Item, ItemKind, LangItem, Lifetime, LifetimeName, ParamName, PolyTraitRef, TraitBoundModifier,
|
|
|
|
TraitFn, TraitItem, TraitItemKind, Ty, TyKind, WhereClause, WherePredicate,
|
2020-02-21 02:39:38 -06:00
|
|
|
};
|
2020-03-30 13:01:57 -05:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2020-03-30 04:02:14 -05:00
|
|
|
use rustc_middle::hir::map::Map;
|
2020-01-11 05:37:08 -06:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-01-04 04:00:00 -06:00
|
|
|
use rustc_span::source_map::Span;
|
2020-08-11 08:43:21 -05:00
|
|
|
use rustc_span::symbol::{kw, Symbol};
|
2019-01-30 19:15:29 -06:00
|
|
|
|
2018-03-28 08:24:26 -05:00
|
|
|
declare_clippy_lint! {
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for lifetime annotations which can be removed by
|
2019-03-05 10:50:33 -06:00
|
|
|
/// relying on lifetime elision.
|
|
|
|
///
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// The additional lifetimes make the code look more
|
2019-03-05 10:50:33 -06:00
|
|
|
/// complicated, while there is nothing out of the ordinary going on. Removing
|
|
|
|
/// them leads to more readable code.
|
|
|
|
///
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### Known problems
|
2020-10-09 05:45:29 -05:00
|
|
|
/// - We bail out if the function has a `where` clause where lifetimes
|
|
|
|
/// are mentioned due to potenial false positives.
|
|
|
|
/// - Lifetime bounds such as `impl Foo + 'a` and `T: 'a` must be elided with the
|
|
|
|
/// placeholder notation `'_` because the fully elided notation leaves the type bound to `'static`.
|
2019-03-05 10:50:33 -06:00
|
|
|
///
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### Example
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```rust
|
2019-11-19 13:03:41 -06:00
|
|
|
/// // Bad: unnecessary lifetime annotations
|
2019-03-05 10:50:33 -06:00
|
|
|
/// fn in_and_out<'a>(x: &'a u8, y: u8) -> &'a u8 {
|
|
|
|
/// x
|
|
|
|
/// }
|
2019-11-19 13:03:41 -06:00
|
|
|
///
|
|
|
|
/// // Good
|
|
|
|
/// fn elided(x: &u8, y: u8) -> &u8 {
|
|
|
|
/// x
|
|
|
|
/// }
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 14:06:26 -05:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2019-03-05 10:50:33 -06:00
|
|
|
pub NEEDLESS_LIFETIMES,
|
|
|
|
complexity,
|
|
|
|
"using explicit lifetimes for references in function arguments when elision rules \
|
|
|
|
would allow omitting them"
|
2016-02-05 17:13:29 -06:00
|
|
|
}
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2018-03-28 08:24:26 -05:00
|
|
|
declare_clippy_lint! {
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for lifetimes in generics that are never used
|
2019-03-05 10:50:33 -06:00
|
|
|
/// anywhere else.
|
|
|
|
///
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// The additional lifetimes make the code look more
|
2019-03-05 10:50:33 -06:00
|
|
|
/// complicated, while there is nothing out of the ordinary going on. Removing
|
|
|
|
/// them leads to more readable code.
|
|
|
|
///
|
2021-07-02 13:37:11 -05:00
|
|
|
/// ### Example
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```rust
|
2019-11-19 13:03:41 -06:00
|
|
|
/// // Bad: unnecessary lifetimes
|
2019-03-05 10:50:33 -06:00
|
|
|
/// fn unused_lifetime<'a>(x: u8) {
|
2019-08-02 01:13:54 -05:00
|
|
|
/// // ..
|
2019-03-05 10:50:33 -06:00
|
|
|
/// }
|
2019-11-19 13:03:41 -06:00
|
|
|
///
|
|
|
|
/// // Good
|
|
|
|
/// fn no_lifetime(x: u8) {
|
|
|
|
/// // ...
|
|
|
|
/// }
|
2019-03-05 10:50:33 -06:00
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 14:06:26 -05:00
|
|
|
#[clippy::version = "pre 1.29.0"]
|
2018-05-26 03:23:34 -05:00
|
|
|
pub EXTRA_UNUSED_LIFETIMES,
|
2018-03-28 08:24:26 -05:00
|
|
|
complexity,
|
2016-02-05 17:13:29 -06:00
|
|
|
"unused lifetimes in function definitions"
|
|
|
|
}
|
2015-12-06 15:36:22 -06:00
|
|
|
|
2019-04-08 15:43:55 -05:00
|
|
|
declare_lint_pass!(Lifetimes => [NEEDLESS_LIFETIMES, EXTRA_UNUSED_LIFETIMES]);
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for Lifetimes {
|
|
|
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
|
2019-11-08 14:12:08 -06:00
|
|
|
if let ItemKind::Fn(ref sig, ref generics, id) = item.kind {
|
2021-04-02 16:35:32 -05:00
|
|
|
check_fn_inner(cx, sig.decl, Some(id), generics, item.span, true);
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
2015-08-13 10:24:47 -05:00
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn check_impl_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx ImplItem<'_>) {
|
2020-03-16 10:00:16 -05:00
|
|
|
if let ImplItemKind::Fn(ref sig, id) = item.kind {
|
2021-01-30 16:25:03 -06:00
|
|
|
let report_extra_lifetimes = trait_ref_of_method(cx, item.hir_id()).is_none();
|
2019-09-01 01:11:40 -05:00
|
|
|
check_fn_inner(
|
|
|
|
cx,
|
2021-04-02 16:35:32 -05:00
|
|
|
sig.decl,
|
2019-09-01 01:11:40 -05:00
|
|
|
Some(id),
|
|
|
|
&item.generics,
|
|
|
|
item.span,
|
|
|
|
report_extra_lifetimes,
|
|
|
|
);
|
2015-08-13 10:24:47 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn check_trait_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx TraitItem<'_>) {
|
2020-03-12 14:56:55 -05:00
|
|
|
if let TraitItemKind::Fn(ref sig, ref body) = item.kind {
|
2017-04-11 07:09:58 -05:00
|
|
|
let body = match *body {
|
2020-03-16 10:00:16 -05:00
|
|
|
TraitFn::Required(_) => None,
|
|
|
|
TraitFn::Provided(id) => Some(id),
|
2017-04-11 07:09:58 -05:00
|
|
|
};
|
2021-04-02 16:35:32 -05:00
|
|
|
check_fn_inner(cx, sig.decl, body, &item.generics, item.span, true);
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-12 13:13:14 -05:00
|
|
|
/// The lifetime of a &-reference.
|
2020-10-09 05:45:29 -05:00
|
|
|
#[derive(PartialEq, Eq, Hash, Debug, Clone)]
|
2015-08-12 06:16:09 -05:00
|
|
|
enum RefLt {
|
|
|
|
Unnamed,
|
|
|
|
Static,
|
2020-08-11 08:43:21 -05:00
|
|
|
Named(Symbol),
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
2016-01-29 15:18:14 -06:00
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn check_fn_inner<'tcx>(
|
|
|
|
cx: &LateContext<'tcx>,
|
2019-12-29 22:02:10 -06:00
|
|
|
decl: &'tcx FnDecl<'_>,
|
2017-04-12 04:06:32 -05:00
|
|
|
body: Option<BodyId>,
|
2019-12-29 22:02:10 -06:00
|
|
|
generics: &'tcx Generics<'_>,
|
2017-08-09 02:30:56 -05:00
|
|
|
span: Span,
|
2019-09-01 01:11:40 -05:00
|
|
|
report_extra_lifetimes: bool,
|
2017-04-12 04:06:32 -05:00
|
|
|
) {
|
2021-10-29 11:14:22 -05:00
|
|
|
if span.from_expansion() || has_where_lifetimes(cx, &generics.where_clause) {
|
2015-08-13 10:24:47 -05:00
|
|
|
return;
|
|
|
|
}
|
2016-01-29 15:18:14 -06:00
|
|
|
|
2020-07-14 07:59:59 -05:00
|
|
|
let types = generics
|
|
|
|
.params
|
|
|
|
.iter()
|
|
|
|
.filter(|param| matches!(param.kind, GenericParamKind::Type { .. }));
|
2018-06-24 19:06:57 -05:00
|
|
|
for typ in types {
|
2019-12-29 22:02:10 -06:00
|
|
|
for bound in typ.bounds {
|
2018-06-24 19:06:57 -05:00
|
|
|
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")
|
|
|
|
.args;
|
2021-04-02 16:35:32 -05:00
|
|
|
if let Some(params) = *params {
|
2018-06-24 19:06:57 -05:00
|
|
|
let lifetimes = params.args.iter().filter_map(|arg| match arg {
|
|
|
|
GenericArg::Lifetime(lt) => Some(lt),
|
2019-02-19 01:34:43 -06:00
|
|
|
_ => None,
|
2018-06-24 19:06:57 -05:00
|
|
|
});
|
|
|
|
for bound in lifetimes {
|
2018-07-01 04:58:29 -05:00
|
|
|
if bound.name != LifetimeName::Static && !bound.is_elided() {
|
2018-06-24 19:06:57 -05:00
|
|
|
return;
|
|
|
|
}
|
2017-04-11 08:44:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-06-24 19:06:57 -05:00
|
|
|
}
|
|
|
|
}
|
2021-04-02 16:35:32 -05:00
|
|
|
if could_use_elision(cx, decl, body, generics.params) {
|
2017-08-09 02:30:56 -05:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_LIFETIMES,
|
2020-03-16 06:44:24 -05:00
|
|
|
span.with_hi(decl.output.span().hi()),
|
2018-11-27 14:14:15 -06:00
|
|
|
"explicit lifetimes given in parameter types where they could be elided \
|
|
|
|
(or replaced with `'_` if needed by type declaration)",
|
2017-08-09 02:30:56 -05:00
|
|
|
);
|
2015-08-13 10:24:47 -05:00
|
|
|
}
|
2019-09-01 01:11:40 -05:00
|
|
|
if report_extra_lifetimes {
|
|
|
|
self::report_extra_lifetimes(cx, decl, generics);
|
|
|
|
}
|
2015-08-13 10:24:47 -05:00
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn could_use_elision<'tcx>(
|
|
|
|
cx: &LateContext<'tcx>,
|
2019-12-29 22:02:10 -06:00
|
|
|
func: &'tcx FnDecl<'_>,
|
2017-04-11 07:09:58 -05:00
|
|
|
body: Option<BodyId>,
|
2019-12-29 22:02:10 -06:00
|
|
|
named_generics: &'tcx [GenericParam<'_>],
|
2016-12-21 05:14:54 -06:00
|
|
|
) -> bool {
|
2015-08-12 06:16:09 -05:00
|
|
|
// There are two scenarios where elision works:
|
|
|
|
// * no output references, all input references have different LT
|
|
|
|
// * output references, exactly one input reference with same LT
|
2015-08-13 10:24:47 -05:00
|
|
|
// All lifetimes must be unnamed, 'static or defined without bounds on the
|
|
|
|
// level of the current item.
|
|
|
|
|
|
|
|
// check named LTs
|
2017-12-21 22:42:47 -06:00
|
|
|
let allowed_lts = allowed_lts_from(named_generics);
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2015-08-12 13:13:14 -05:00
|
|
|
// these will collect all the lifetimes for references in arg/return types
|
2015-11-10 17:12:45 -06:00
|
|
|
let mut input_visitor = RefVisitor::new(cx);
|
|
|
|
let mut output_visitor = RefVisitor::new(cx);
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2015-08-12 13:13:14 -05:00
|
|
|
// extract lifetimes in input argument types
|
2019-12-29 22:02:10 -06:00
|
|
|
for arg in func.inputs {
|
2017-01-04 17:48:34 -06:00
|
|
|
input_visitor.visit_ty(arg);
|
2015-08-12 13:13:14 -05:00
|
|
|
}
|
|
|
|
// extract lifetimes in output type
|
2021-04-02 16:35:32 -05:00
|
|
|
if let Return(ty) = func.output {
|
2015-11-10 17:12:45 -06:00
|
|
|
output_visitor.visit_ty(ty);
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
2020-10-09 05:45:29 -05:00
|
|
|
for lt in named_generics {
|
2021-05-24 19:54:50 -05:00
|
|
|
input_visitor.visit_generic_param(lt);
|
2020-10-09 05:45:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if input_visitor.abort() || output_visitor.abort() {
|
|
|
|
return false;
|
|
|
|
}
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2020-10-09 05:45:29 -05:00
|
|
|
if allowed_lts
|
2020-11-05 07:29:48 -06:00
|
|
|
.intersection(
|
|
|
|
&input_visitor
|
2020-10-09 05:45:29 -05:00
|
|
|
.nested_elision_site_lts
|
|
|
|
.iter()
|
|
|
|
.chain(output_visitor.nested_elision_site_lts.iter())
|
|
|
|
.cloned()
|
2020-11-05 07:29:48 -06:00
|
|
|
.filter(|v| matches!(v, RefLt::Named(_)))
|
|
|
|
.collect(),
|
|
|
|
)
|
2020-10-09 05:45:29 -05:00
|
|
|
.next()
|
|
|
|
.is_some()
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
let input_lts = input_visitor.lts;
|
|
|
|
let output_lts = output_visitor.lts;
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2017-04-11 07:09:58 -05:00
|
|
|
if let Some(body_id) = body {
|
2017-09-05 04:33:04 -05:00
|
|
|
let mut checker = BodyLifetimeChecker {
|
|
|
|
lifetimes_used_in_body: false,
|
|
|
|
};
|
2018-12-07 18:56:03 -06:00
|
|
|
checker.visit_expr(&cx.tcx.hir().body(body_id).value);
|
2017-04-11 07:09:58 -05:00
|
|
|
if checker.lifetimes_used_in_body {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-13 10:24:47 -05:00
|
|
|
// check for lifetimes from higher scopes
|
|
|
|
for lt in input_lts.iter().chain(output_lts.iter()) {
|
|
|
|
if !allowed_lts.contains(lt) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-12 06:16:09 -05:00
|
|
|
// no input lifetimes? easy case!
|
|
|
|
if input_lts.is_empty() {
|
2015-11-18 05:35:18 -06:00
|
|
|
false
|
2015-08-12 06:16:09 -05:00
|
|
|
} else if output_lts.is_empty() {
|
|
|
|
// no output lifetimes, check distinctness of input lifetimes
|
|
|
|
|
2015-08-15 02:36:02 -05:00
|
|
|
// only unnamed and static, ok
|
2018-11-27 14:14:15 -06:00
|
|
|
let unnamed_and_static = input_lts.iter().all(|lt| *lt == RefLt::Unnamed || *lt == RefLt::Static);
|
2017-08-09 02:59:38 -05:00
|
|
|
if unnamed_and_static {
|
2015-08-12 06:16:09 -05:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// we have no output reference, so we only need all distinct lifetimes
|
2015-11-18 05:35:18 -06:00
|
|
|
input_lts.len() == unique_lifetimes(&input_lts)
|
2015-08-12 06:16:09 -05:00
|
|
|
} else {
|
|
|
|
// we have output references, so we need one input reference,
|
|
|
|
// and all output lifetimes must be the same
|
|
|
|
if unique_lifetimes(&output_lts) > 1 {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if input_lts.len() == 1 {
|
|
|
|
match (&input_lts[0], &output_lts[0]) {
|
2016-01-29 15:18:14 -06:00
|
|
|
(&RefLt::Named(n1), &RefLt::Named(n2)) if n1 == n2 => true,
|
|
|
|
(&RefLt::Named(_), &RefLt::Unnamed) => true,
|
2017-09-05 04:33:04 -05:00
|
|
|
_ => false, /* already elided, different named lifetimes
|
|
|
|
* or something static going on */
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
2015-11-18 05:35:18 -06:00
|
|
|
} else {
|
|
|
|
false
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-29 22:02:10 -06:00
|
|
|
fn allowed_lts_from(named_generics: &[GenericParam<'_>]) -> FxHashSet<RefLt> {
|
2018-09-11 18:34:52 -05:00
|
|
|
let mut allowed_lts = FxHashSet::default();
|
2017-12-21 22:42:47 -06:00
|
|
|
for par in named_generics.iter() {
|
2018-06-24 16:42:52 -05:00
|
|
|
if let GenericParamKind::Lifetime { .. } = par.kind {
|
|
|
|
if par.bounds.is_empty() {
|
2018-06-28 08:46:58 -05:00
|
|
|
allowed_lts.insert(RefLt::Named(par.name.ident().name));
|
2017-12-21 22:42:47 -06:00
|
|
|
}
|
2015-08-31 04:11:51 -05:00
|
|
|
}
|
|
|
|
}
|
2016-01-29 15:18:14 -06:00
|
|
|
allowed_lts.insert(RefLt::Unnamed);
|
|
|
|
allowed_lts.insert(RefLt::Static);
|
2015-08-31 04:11:51 -05:00
|
|
|
allowed_lts
|
|
|
|
}
|
|
|
|
|
2015-08-12 13:13:14 -05:00
|
|
|
/// Number of unique lifetimes in the given vector.
|
2019-09-18 01:37:41 -05:00
|
|
|
#[must_use]
|
2015-08-13 09:28:11 -05:00
|
|
|
fn unique_lifetimes(lts: &[RefLt]) -> usize {
|
2018-09-11 18:34:52 -05:00
|
|
|
lts.iter().collect::<FxHashSet<_>>().len()
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
|
|
|
|
2021-03-12 08:30:50 -06:00
|
|
|
const CLOSURE_TRAIT_BOUNDS: [LangItem; 3] = [LangItem::Fn, LangItem::FnMut, LangItem::FnOnce];
|
2020-10-09 05:45:29 -05:00
|
|
|
|
2016-01-29 15:18:14 -06:00
|
|
|
/// A visitor usable for `rustc_front::visit::walk_ty()`.
|
2019-06-19 13:36:23 -05:00
|
|
|
struct RefVisitor<'a, 'tcx> {
|
2020-06-25 15:41:36 -05:00
|
|
|
cx: &'a LateContext<'tcx>,
|
2016-01-03 22:26:12 -06:00
|
|
|
lts: Vec<RefLt>,
|
2020-10-09 05:45:29 -05:00
|
|
|
nested_elision_site_lts: Vec<RefLt>,
|
|
|
|
unelided_trait_object_lifetime: bool,
|
2015-11-10 17:12:45 -06:00
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
impl<'a, 'tcx> RefVisitor<'a, 'tcx> {
|
|
|
|
fn new(cx: &'a LateContext<'tcx>) -> Self {
|
2017-08-21 06:32:12 -05:00
|
|
|
Self {
|
2018-03-15 10:07:15 -05:00
|
|
|
cx,
|
2016-01-03 22:26:12 -06:00
|
|
|
lts: Vec::new(),
|
2020-10-09 05:45:29 -05:00
|
|
|
nested_elision_site_lts: Vec::new(),
|
|
|
|
unelided_trait_object_lifetime: false,
|
2016-01-03 22:26:12 -06:00
|
|
|
}
|
2015-11-10 17:12:45 -06:00
|
|
|
}
|
2015-08-12 06:16:09 -05:00
|
|
|
|
2015-08-12 13:13:14 -05:00
|
|
|
fn record(&mut self, lifetime: &Option<Lifetime>) {
|
2015-11-24 11:44:40 -06:00
|
|
|
if let Some(ref lt) = *lifetime {
|
2018-07-01 04:58:29 -05:00
|
|
|
if lt.name == LifetimeName::Static {
|
2016-01-29 15:18:14 -06:00
|
|
|
self.lts.push(RefLt::Static);
|
2019-07-09 12:57:25 -05:00
|
|
|
} else if let LifetimeName::Param(ParamName::Fresh(_)) = lt.name {
|
|
|
|
// Fresh lifetimes generated should be ignored.
|
2017-02-03 04:52:13 -06:00
|
|
|
} else if lt.is_elided() {
|
|
|
|
self.lts.push(RefLt::Unnamed);
|
2015-08-12 06:16:09 -05:00
|
|
|
} else {
|
2018-06-28 08:46:58 -05:00
|
|
|
self.lts.push(RefLt::Named(lt.name.ident().name));
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
|
|
|
} else {
|
2016-01-29 15:18:14 -06:00
|
|
|
self.lts.push(RefLt::Unnamed);
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
|
|
|
}
|
2015-08-12 13:13:14 -05:00
|
|
|
|
2020-10-09 05:45:29 -05:00
|
|
|
fn all_lts(&self) -> Vec<RefLt> {
|
|
|
|
self.lts
|
|
|
|
.iter()
|
|
|
|
.chain(self.nested_elision_site_lts.iter())
|
|
|
|
.cloned()
|
|
|
|
.collect::<Vec<_>>()
|
2015-11-10 17:12:45 -06:00
|
|
|
}
|
|
|
|
|
2020-10-09 05:45:29 -05:00
|
|
|
fn abort(&self) -> bool {
|
|
|
|
self.unelided_trait_object_lifetime
|
2015-08-12 13:13:14 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-06 04:32:21 -06:00
|
|
|
impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
|
2020-01-09 01:13:22 -06:00
|
|
|
type Map = Map<'tcx>;
|
|
|
|
|
2015-08-12 23:43:25 -05:00
|
|
|
// for lifetimes as parameters of generics
|
2016-12-06 04:32:21 -06:00
|
|
|
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
|
2015-08-12 23:43:25 -05:00
|
|
|
self.record(&Some(*lifetime));
|
|
|
|
}
|
2015-09-30 09:40:54 -05:00
|
|
|
|
2020-10-09 05:45:29 -05:00
|
|
|
fn visit_poly_trait_ref(&mut self, poly_tref: &'tcx PolyTraitRef<'tcx>, tbm: TraitBoundModifier) {
|
|
|
|
let trait_ref = &poly_tref.trait_ref;
|
2021-03-12 08:30:50 -06:00
|
|
|
if CLOSURE_TRAIT_BOUNDS.iter().any(|&item| {
|
|
|
|
self.cx
|
|
|
|
.tcx
|
|
|
|
.lang_items()
|
|
|
|
.require(item)
|
|
|
|
.map_or(false, |id| Some(id) == trait_ref.trait_def_id())
|
|
|
|
}) {
|
2020-10-09 05:45:29 -05:00
|
|
|
let mut sub_visitor = RefVisitor::new(self.cx);
|
|
|
|
sub_visitor.visit_trait_ref(trait_ref);
|
|
|
|
self.nested_elision_site_lts.append(&mut sub_visitor.all_lts());
|
|
|
|
} else {
|
|
|
|
walk_poly_trait_ref(self, poly_tref, tbm);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-29 22:02:10 -06:00
|
|
|
fn visit_ty(&mut self, ty: &'tcx Ty<'_>) {
|
2019-09-27 10:16:06 -05:00
|
|
|
match ty.kind {
|
2021-10-30 05:02:20 -05:00
|
|
|
TyKind::OpaqueDef(item, bounds) => {
|
2019-03-28 23:47:09 -05:00
|
|
|
let map = self.cx.tcx.hir();
|
2021-01-30 05:06:04 -06:00
|
|
|
let item = map.item(item);
|
2020-10-09 05:45:29 -05:00
|
|
|
walk_item(self, item);
|
2018-10-05 15:41:40 -05:00
|
|
|
walk_ty(self, ty);
|
2021-10-30 05:02:20 -05:00
|
|
|
self.lts.extend(bounds.iter().filter_map(|bound| match bound {
|
|
|
|
GenericArg::Lifetime(l) => Some(RefLt::Named(l.name.ident().name)),
|
|
|
|
_ => None,
|
|
|
|
}));
|
2018-11-27 14:14:15 -06:00
|
|
|
},
|
2020-10-09 05:45:29 -05:00
|
|
|
TyKind::BareFn(&BareFnTy { decl, .. }) => {
|
|
|
|
let mut sub_visitor = RefVisitor::new(self.cx);
|
|
|
|
sub_visitor.visit_fn_decl(decl);
|
|
|
|
self.nested_elision_site_lts.append(&mut sub_visitor.all_lts());
|
|
|
|
return;
|
|
|
|
},
|
2021-03-13 06:44:29 -06:00
|
|
|
TyKind::TraitObject(bounds, ref lt, _) => {
|
2017-02-04 06:18:51 -06:00
|
|
|
if !lt.is_elided() {
|
2020-10-09 05:45:29 -05:00
|
|
|
self.unelided_trait_object_lifetime = true;
|
2017-02-04 06:18:51 -06:00
|
|
|
}
|
|
|
|
for bound in bounds {
|
|
|
|
self.visit_poly_trait_ref(bound, TraitBoundModifier::None);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
},
|
2016-04-14 13:14:03 -05:00
|
|
|
_ => (),
|
2015-09-30 09:40:54 -05:00
|
|
|
}
|
|
|
|
walk_ty(self, ty);
|
|
|
|
}
|
2020-03-15 17:41:20 -05:00
|
|
|
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
|
2016-12-06 04:32:21 -06:00
|
|
|
NestedVisitorMap::None
|
|
|
|
}
|
2015-08-12 06:16:09 -05:00
|
|
|
}
|
2015-08-30 02:57:52 -05:00
|
|
|
|
2019-03-10 12:19:47 -05:00
|
|
|
/// Are any lifetimes mentioned in the `where` clause? If so, we don't try to
|
2015-08-30 02:57:52 -05:00
|
|
|
/// reason about elision.
|
2020-06-25 15:41:36 -05:00
|
|
|
fn has_where_lifetimes<'tcx>(cx: &LateContext<'tcx>, where_clause: &'tcx WhereClause<'_>) -> bool {
|
2019-12-29 22:02:10 -06:00
|
|
|
for predicate in where_clause.predicates {
|
2015-08-30 02:57:52 -05:00
|
|
|
match *predicate {
|
|
|
|
WherePredicate::RegionPredicate(..) => return true,
|
|
|
|
WherePredicate::BoundPredicate(ref pred) => {
|
2015-08-31 04:11:51 -05:00
|
|
|
// a predicate like F: Trait or F: for<'a> Trait<'a>
|
2015-11-10 17:12:45 -06:00
|
|
|
let mut visitor = RefVisitor::new(cx);
|
2015-08-31 04:11:51 -05:00
|
|
|
// walk the type F, it may not contain LT refs
|
2021-04-02 16:35:32 -05:00
|
|
|
walk_ty(&mut visitor, pred.bounded_ty);
|
2020-10-28 17:36:07 -05:00
|
|
|
if !visitor.all_lts().is_empty() {
|
2016-01-03 22:26:12 -06:00
|
|
|
return true;
|
|
|
|
}
|
2015-08-31 04:11:51 -05:00
|
|
|
// if the bounds define new lifetimes, they are fine to occur
|
2021-04-02 16:35:32 -05:00
|
|
|
let allowed_lts = allowed_lts_from(pred.bound_generic_params);
|
2015-08-31 04:11:51 -05:00
|
|
|
// now walk the bounds
|
|
|
|
for bound in pred.bounds.iter() {
|
2018-06-24 08:32:40 -05:00
|
|
|
walk_param_bound(&mut visitor, bound);
|
2015-08-31 04:11:51 -05:00
|
|
|
}
|
|
|
|
// and check that all lifetimes are allowed
|
2020-10-28 17:36:07 -05:00
|
|
|
if visitor.all_lts().iter().any(|it| !allowed_lts.contains(it)) {
|
|
|
|
return true;
|
|
|
|
}
|
2016-12-20 11:21:30 -06:00
|
|
|
},
|
2015-08-30 02:57:52 -05:00
|
|
|
WherePredicate::EqPredicate(ref pred) => {
|
2015-11-10 17:12:45 -06:00
|
|
|
let mut visitor = RefVisitor::new(cx);
|
2021-04-02 16:35:32 -05:00
|
|
|
walk_ty(&mut visitor, pred.lhs_ty);
|
|
|
|
walk_ty(&mut visitor, pred.rhs_ty);
|
2016-01-03 22:26:12 -06:00
|
|
|
if !visitor.lts.is_empty() {
|
|
|
|
return true;
|
|
|
|
}
|
2016-12-20 11:21:30 -06:00
|
|
|
},
|
2015-08-30 02:57:52 -05:00
|
|
|
}
|
|
|
|
}
|
2015-08-31 04:11:51 -05:00
|
|
|
false
|
2015-08-30 02:57:52 -05:00
|
|
|
}
|
2015-12-06 15:36:22 -06:00
|
|
|
|
2016-12-06 04:32:21 -06:00
|
|
|
struct LifetimeChecker {
|
2020-08-11 08:43:21 -05:00
|
|
|
map: FxHashMap<Symbol, Span>,
|
2016-12-06 04:32:21 -06:00
|
|
|
}
|
2015-12-06 15:36:22 -06:00
|
|
|
|
2016-12-06 04:32:21 -06:00
|
|
|
impl<'tcx> Visitor<'tcx> for LifetimeChecker {
|
2020-01-09 01:13:22 -06:00
|
|
|
type Map = Map<'tcx>;
|
|
|
|
|
2015-12-06 15:36:22 -06:00
|
|
|
// for lifetimes as parameters of generics
|
2016-12-06 04:32:21 -06:00
|
|
|
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
|
2018-06-28 08:46:58 -05:00
|
|
|
self.map.remove(&lifetime.name.ident().name);
|
2015-12-06 15:36:22 -06:00
|
|
|
}
|
2015-12-10 10:44:12 -06:00
|
|
|
|
2019-12-29 22:02:10 -06:00
|
|
|
fn visit_generic_param(&mut self, param: &'tcx GenericParam<'_>) {
|
2015-12-10 10:44:12 -06:00
|
|
|
// 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
|
2018-06-24 08:32:40 -05:00
|
|
|
if let GenericParamKind::Type { .. } = param.kind {
|
2021-05-24 19:54:50 -05:00
|
|
|
walk_generic_param(self, param);
|
2017-12-21 22:42:47 -06:00
|
|
|
}
|
2015-12-10 10:44:12 -06:00
|
|
|
}
|
2020-03-15 17:41:20 -05:00
|
|
|
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
|
2016-12-06 04:32:21 -06:00
|
|
|
NestedVisitorMap::None
|
|
|
|
}
|
2015-12-06 15:36:22 -06:00
|
|
|
}
|
|
|
|
|
2020-06-25 15:41:36 -05:00
|
|
|
fn report_extra_lifetimes<'tcx>(cx: &LateContext<'tcx>, func: &'tcx FnDecl<'_>, generics: &'tcx Generics<'_>) {
|
2018-11-27 14:14:15 -06:00
|
|
|
let hs = generics
|
|
|
|
.params
|
|
|
|
.iter()
|
2018-06-24 16:42:52 -05:00
|
|
|
.filter_map(|par| match par.kind {
|
2018-06-28 08:46:58 -05:00
|
|
|
GenericParamKind::Lifetime { .. } => Some((par.name.ident().name, par.span)),
|
2018-06-24 16:42:52 -05:00
|
|
|
_ => None,
|
|
|
|
})
|
2016-12-20 11:21:30 -06:00
|
|
|
.collect();
|
2016-12-06 04:32:21 -06:00
|
|
|
let mut checker = LifetimeChecker { map: hs };
|
2016-01-14 12:27:24 -06:00
|
|
|
|
2015-12-10 10:44:12 -06:00
|
|
|
walk_generics(&mut checker, generics);
|
2015-12-06 15:36:22 -06:00
|
|
|
walk_fn_decl(&mut checker, func);
|
2016-01-14 12:27:24 -06:00
|
|
|
|
2016-12-06 04:32:21 -06:00
|
|
|
for &v in checker.map.values() {
|
2018-11-27 14:14:15 -06:00
|
|
|
span_lint(
|
|
|
|
cx,
|
|
|
|
EXTRA_UNUSED_LIFETIMES,
|
|
|
|
v,
|
|
|
|
"this lifetime isn't used in the function definition",
|
|
|
|
);
|
2015-12-06 15:36:22 -06:00
|
|
|
}
|
|
|
|
}
|
2017-04-11 07:09:58 -05:00
|
|
|
|
|
|
|
struct BodyLifetimeChecker {
|
|
|
|
lifetimes_used_in_body: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'tcx> Visitor<'tcx> for BodyLifetimeChecker {
|
2020-01-09 01:13:22 -06:00
|
|
|
type Map = Map<'tcx>;
|
|
|
|
|
2017-04-11 07:09:58 -05:00
|
|
|
// for lifetimes as parameters of generics
|
|
|
|
fn visit_lifetime(&mut self, lifetime: &'tcx Lifetime) {
|
2020-12-29 19:28:08 -06:00
|
|
|
if lifetime.name.ident().name != kw::Empty && lifetime.name.ident().name != kw::StaticLifetime {
|
2017-04-11 07:09:58 -05:00
|
|
|
self.lifetimes_used_in_body = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-15 17:41:20 -05:00
|
|
|
fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
|
2017-04-11 07:09:58 -05:00
|
|
|
NestedVisitorMap::None
|
|
|
|
}
|
2017-04-11 08:54:48 -05:00
|
|
|
}
|