2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_sugg};
|
|
|
|
use clippy_utils::source::{snippet, snippet_with_macro_callsite};
|
|
|
|
use clippy_utils::sugg::Sugg;
|
2021-05-20 10:30:31 +00:00
|
|
|
use clippy_utils::ty::{is_type_diagnostic_item, same_type_and_consts};
|
2021-07-29 10:16:06 +00:00
|
|
|
use clippy_utils::{get_parent_expr, is_trait_method, match_def_path, paths};
|
2020-05-28 13:45:24 +00:00
|
|
|
use if_chain::if_chain;
|
2018-12-29 15:04:45 +00:00
|
|
|
use rustc_errors::Applicability;
|
2020-02-21 08:39:38 +00:00
|
|
|
use rustc_hir::{Expr, ExprKind, HirId, MatchSource};
|
2020-01-12 06:08:41 +00:00
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
2021-05-20 10:30:31 +00:00
|
|
|
use rustc_middle::ty;
|
2020-01-11 11:37:08 +00:00
|
|
|
use rustc_session::{declare_tool_lint, impl_lint_pass};
|
2020-11-05 13:29:48 +00:00
|
|
|
use rustc_span::sym;
|
2017-02-05 04:41:09 +00:00
|
|
|
|
2018-03-28 13:24:26 +00:00
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for `Into`, `TryInto`, `From`, `TryFrom`, or `IntoIter` calls
|
2020-11-23 12:51:04 +00:00
|
|
|
/// which uselessly convert to the same type.
|
2019-03-05 16:50:33 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Redundant code.
|
2020-05-17 15:36:26 +00:00
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2019-03-05 16:50:33 +00:00
|
|
|
/// ```rust
|
2020-05-17 15:36:26 +00:00
|
|
|
/// // Bad
|
2019-03-05 16:50:33 +00:00
|
|
|
/// // format!() returns a `String`
|
|
|
|
/// let s: String = format!("hello").into();
|
2020-05-17 15:36:26 +00:00
|
|
|
///
|
|
|
|
/// // Good
|
|
|
|
/// let s: String = format!("hello");
|
2019-03-05 16:50:33 +00: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 19:06:26 +00:00
|
|
|
#[clippy::version = "1.45.0"]
|
2020-05-17 15:36:26 +00:00
|
|
|
pub USELESS_CONVERSION,
|
2018-03-28 13:24:26 +00:00
|
|
|
complexity,
|
2020-11-23 12:51:04 +00:00
|
|
|
"calls to `Into`, `TryInto`, `From`, `TryFrom`, or `IntoIter` which perform useless conversions to the same type"
|
2017-02-05 04:41:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Default)]
|
2020-05-17 15:36:26 +00:00
|
|
|
pub struct UselessConversion {
|
2019-02-24 18:43:15 +00:00
|
|
|
try_desugar_arm: Vec<HirId>,
|
2017-02-05 04:41:09 +00:00
|
|
|
}
|
|
|
|
|
2020-05-17 15:36:26 +00:00
|
|
|
impl_lint_pass!(UselessConversion => [USELESS_CONVERSION]);
|
2017-02-05 04:41:09 +00:00
|
|
|
|
2020-05-28 13:45:24 +00:00
|
|
|
#[allow(clippy::too_many_lines)]
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for UselessConversion {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2019-08-19 16:30:32 +00:00
|
|
|
if e.span.from_expansion() {
|
2017-02-05 04:41:09 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-02-24 18:43:15 +00:00
|
|
|
if Some(&e.hir_id) == self.try_desugar_arm.last() {
|
2017-02-05 04:41:09 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-09-27 15:16:06 +00:00
|
|
|
match e.kind {
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::Match(_, arms, MatchSource::TryDesugar) => {
|
2019-09-27 15:16:06 +00:00
|
|
|
let e = match arms[0].body.kind {
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::Ret(Some(e)) | ExprKind::Break(_, Some(e)) => e,
|
2017-02-05 04:41:09 +00:00
|
|
|
_ => return,
|
|
|
|
};
|
2021-04-08 15:50:13 +00:00
|
|
|
if let ExprKind::Call(_, args) = e.kind {
|
2019-02-24 18:43:15 +00:00
|
|
|
self.try_desugar_arm.push(args[0].hir_id);
|
2017-02-05 04:41:09 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::MethodCall(name, .., args, _) => {
|
2021-10-02 23:51:01 +00:00
|
|
|
if is_trait_method(cx, e, sym::Into) && &*name.ident.as_str() == "into" {
|
2020-07-17 08:47:04 +00:00
|
|
|
let a = cx.typeck_results().expr_ty(e);
|
|
|
|
let b = cx.typeck_results().expr_ty(&args[0]);
|
2021-05-20 10:30:31 +00:00
|
|
|
if same_type_and_consts(a, b) {
|
2018-10-27 09:01:27 +00:00
|
|
|
let sugg = snippet_with_macro_callsite(cx, args[0].span, "<expr>").to_string();
|
2020-04-17 14:01:25 +00:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
2020-05-17 15:36:26 +00:00
|
|
|
USELESS_CONVERSION,
|
2020-04-17 14:01:25 +00:00
|
|
|
e.span,
|
2020-09-24 12:49:22 +00:00
|
|
|
&format!("useless conversion to the same type: `{}`", b),
|
2020-04-17 14:01:25 +00:00
|
|
|
"consider removing `.into()`",
|
|
|
|
sugg,
|
|
|
|
Applicability::MachineApplicable, // snippet
|
|
|
|
);
|
2017-02-05 04:41:09 +00:00
|
|
|
}
|
|
|
|
}
|
2021-07-29 10:16:06 +00:00
|
|
|
if is_trait_method(cx, e, sym::IntoIterator) && name.ident.name == sym::into_iter {
|
2020-07-26 19:07:07 +00:00
|
|
|
if let Some(parent_expr) = get_parent_expr(cx, e) {
|
2021-04-08 15:50:13 +00:00
|
|
|
if let ExprKind::MethodCall(parent_name, ..) = parent_expr.kind {
|
2021-01-15 09:56:44 +00:00
|
|
|
if parent_name.ident.name != sym::into_iter {
|
2020-07-26 19:07:07 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-07-17 08:47:04 +00:00
|
|
|
let a = cx.typeck_results().expr_ty(e);
|
|
|
|
let b = cx.typeck_results().expr_ty(&args[0]);
|
2021-05-20 10:30:31 +00:00
|
|
|
if same_type_and_consts(a, b) {
|
2018-07-30 04:02:05 +00:00
|
|
|
let sugg = snippet(cx, args[0].span, "<expr>").into_owned();
|
2020-04-17 14:01:25 +00:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
2020-05-17 15:36:26 +00:00
|
|
|
USELESS_CONVERSION,
|
2020-04-17 14:01:25 +00:00
|
|
|
e.span,
|
2020-09-24 12:49:22 +00:00
|
|
|
&format!("useless conversion to the same type: `{}`", b),
|
2020-04-17 14:01:25 +00:00
|
|
|
"consider removing `.into_iter()`",
|
|
|
|
sugg,
|
|
|
|
Applicability::MachineApplicable, // snippet
|
|
|
|
);
|
2018-07-30 04:02:05 +00:00
|
|
|
}
|
|
|
|
}
|
2021-04-08 15:50:13 +00:00
|
|
|
if_chain! {
|
2021-10-02 23:51:01 +00:00
|
|
|
if is_trait_method(cx, e, sym::TryInto) && name.ident.name == sym::try_into;
|
2021-04-08 15:50:13 +00:00
|
|
|
let a = cx.typeck_results().expr_ty(e);
|
|
|
|
let b = cx.typeck_results().expr_ty(&args[0]);
|
2021-10-02 23:51:01 +00:00
|
|
|
if is_type_diagnostic_item(cx, a, sym::Result);
|
2021-04-08 15:50:13 +00:00
|
|
|
if let ty::Adt(_, substs) = a.kind();
|
|
|
|
if let Some(a_type) = substs.types().next();
|
2021-05-20 10:30:31 +00:00
|
|
|
if same_type_and_consts(a_type, b);
|
|
|
|
|
2021-04-08 15:50:13 +00:00
|
|
|
then {
|
|
|
|
span_lint_and_help(
|
|
|
|
cx,
|
|
|
|
USELESS_CONVERSION,
|
|
|
|
e.span,
|
|
|
|
&format!("useless conversion to the same type: `{}`", b),
|
|
|
|
None,
|
|
|
|
"consider removing `.try_into()`",
|
|
|
|
);
|
2020-05-28 13:45:24 +00:00
|
|
|
}
|
|
|
|
}
|
2017-02-05 04:41:09 +00:00
|
|
|
},
|
|
|
|
|
2021-04-08 15:50:13 +00:00
|
|
|
ExprKind::Call(path, args) => {
|
2020-05-28 13:45:24 +00:00
|
|
|
if_chain! {
|
|
|
|
if args.len() == 1;
|
|
|
|
if let ExprKind::Path(ref qpath) = path.kind;
|
2020-06-26 02:55:23 +00:00
|
|
|
if let Some(def_id) = cx.qpath_res(qpath, path.hir_id).opt_def_id();
|
2020-05-28 13:45:24 +00:00
|
|
|
then {
|
2021-04-08 15:50:13 +00:00
|
|
|
let a = cx.typeck_results().expr_ty(e);
|
|
|
|
let b = cx.typeck_results().expr_ty(&args[0]);
|
2020-05-28 13:45:24 +00:00
|
|
|
if_chain! {
|
|
|
|
if match_def_path(cx, def_id, &paths::TRY_FROM);
|
2021-10-02 23:51:01 +00:00
|
|
|
if is_type_diagnostic_item(cx, a, sym::Result);
|
2020-08-03 22:18:29 +00:00
|
|
|
if let ty::Adt(_, substs) = a.kind();
|
2020-05-28 13:45:24 +00:00
|
|
|
if let Some(a_type) = substs.types().next();
|
2021-05-20 10:30:31 +00:00
|
|
|
if same_type_and_consts(a_type, b);
|
2020-05-28 13:45:24 +00:00
|
|
|
|
|
|
|
then {
|
|
|
|
let hint = format!("consider removing `{}()`", snippet(cx, path.span, "TryFrom::try_from"));
|
|
|
|
span_lint_and_help(
|
|
|
|
cx,
|
|
|
|
USELESS_CONVERSION,
|
|
|
|
e.span,
|
2020-09-24 12:49:22 +00:00
|
|
|
&format!("useless conversion to the same type: `{}`", b),
|
2020-05-28 13:45:24 +00:00
|
|
|
None,
|
|
|
|
&hint,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if_chain! {
|
|
|
|
if match_def_path(cx, def_id, &paths::FROM_FROM);
|
2021-05-20 10:30:31 +00:00
|
|
|
if same_type_and_consts(a, b);
|
2020-05-28 13:45:24 +00:00
|
|
|
|
|
|
|
then {
|
2020-08-28 14:10:16 +00:00
|
|
|
let sugg = Sugg::hir_with_macro_callsite(cx, &args[0], "<expr>").maybe_par();
|
2018-11-27 20:14:15 +00:00
|
|
|
let sugg_msg =
|
|
|
|
format!("consider removing `{}()`", snippet(cx, path.span, "From::from"));
|
2020-04-17 14:01:25 +00:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
2020-05-17 15:36:26 +00:00
|
|
|
USELESS_CONVERSION,
|
2020-04-17 14:01:25 +00:00
|
|
|
e.span,
|
2020-09-24 12:49:22 +00:00
|
|
|
&format!("useless conversion to the same type: `{}`", b),
|
2020-04-17 14:01:25 +00:00
|
|
|
&sugg_msg,
|
2020-08-28 14:10:16 +00:00
|
|
|
sugg.to_string(),
|
2020-04-17 14:01:25 +00:00
|
|
|
Applicability::MachineApplicable, // snippet
|
|
|
|
);
|
2018-11-27 20:14:15 +00:00
|
|
|
}
|
2017-02-05 04:41:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
_ => {},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
fn check_expr_post(&mut self, _: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
|
2019-02-24 18:43:15 +00:00
|
|
|
if Some(&e.hir_id) == self.try_desugar_arm.last() {
|
2017-02-05 04:41:09 +00:00
|
|
|
self.try_desugar_arm.pop();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|