5fa961b951
Specifically, change `Ty` from this: ``` pub type Ty<'tcx> = &'tcx TyS<'tcx>; ``` to this ``` pub struct Ty<'tcx>(Interned<'tcx, TyS<'tcx>>); ``` There are two benefits to this. - It's now a first class type, so we can define methods on it. This means we can move a lot of methods away from `TyS`, leaving `TyS` as a barely-used type, which is appropriate given that it's not meant to be used directly. - The uniqueness requirement is now explicit, via the `Interned` type. E.g. the pointer-based `Eq` and `Hash` comes from `Interned`, rather than via `TyS`, which wasn't obvious at all. Much of this commit is boring churn. The interesting changes are in these files: - compiler/rustc_middle/src/arena.rs - compiler/rustc_middle/src/mir/visit.rs - compiler/rustc_middle/src/ty/context.rs - compiler/rustc_middle/src/ty/mod.rs Specifically: - Most mentions of `TyS` are removed. It's very much a dumb struct now; `Ty` has all the smarts. - `TyS` now has `crate` visibility instead of `pub`. - `TyS::make_for_test` is removed in favour of the static `BOOL_TY`, which just works better with the new structure. - The `Eq`/`Ord`/`Hash` impls are removed from `TyS`. `Interned`s impls of `Eq`/`Hash` now suffice. `Ord` is now partly on `Interned` (pointer-based, for the `Equal` case) and partly on `TyS` (contents-based, for the other cases). - There are many tedious sigil adjustments, i.e. adding or removing `*` or `&`. They seem to be unavoidable.
63 lines
1.8 KiB
Rust
63 lines
1.8 KiB
Rust
use clippy_utils::diagnostics::span_lint_and_sugg;
|
|
use clippy_utils::source::snippet;
|
|
use clippy_utils::ty::{get_iterator_item_ty, is_copy};
|
|
use itertools::Itertools;
|
|
use rustc_errors::Applicability;
|
|
use rustc_hir as hir;
|
|
use rustc_lint::LateContext;
|
|
use rustc_middle::ty;
|
|
use std::ops::Not;
|
|
|
|
use super::ITER_OVEREAGER_CLONED;
|
|
use crate::redundant_clone::REDUNDANT_CLONE;
|
|
|
|
/// lint overeager use of `cloned()` for `Iterator`s
|
|
pub(super) fn check<'tcx>(
|
|
cx: &LateContext<'tcx>,
|
|
expr: &'tcx hir::Expr<'_>,
|
|
recv: &'tcx hir::Expr<'_>,
|
|
name: &str,
|
|
map_arg: &[hir::Expr<'_>],
|
|
) {
|
|
// Check if it's iterator and get type associated with `Item`.
|
|
let inner_ty = match get_iterator_item_ty(cx, cx.typeck_results().expr_ty_adjusted(recv)) {
|
|
Some(ty) => ty,
|
|
_ => return,
|
|
};
|
|
|
|
match inner_ty.kind() {
|
|
ty::Ref(_, ty, _) if !is_copy(cx, *ty) => {},
|
|
_ => return,
|
|
};
|
|
|
|
let (lint, preserve_cloned) = match name {
|
|
"count" => (REDUNDANT_CLONE, false),
|
|
_ => (ITER_OVEREAGER_CLONED, true),
|
|
};
|
|
let wildcard_params = map_arg.is_empty().not().then(|| "...").unwrap_or_default();
|
|
let msg = format!(
|
|
"called `cloned().{}({})` on an `Iterator`. It may be more efficient to call `{}({}){}` instead",
|
|
name,
|
|
wildcard_params,
|
|
name,
|
|
wildcard_params,
|
|
preserve_cloned.then(|| ".cloned()").unwrap_or_default(),
|
|
);
|
|
|
|
span_lint_and_sugg(
|
|
cx,
|
|
lint,
|
|
expr.span,
|
|
&msg,
|
|
"try this",
|
|
format!(
|
|
"{}.{}({}){}",
|
|
snippet(cx, recv.span, ".."),
|
|
name,
|
|
map_arg.iter().map(|a| snippet(cx, a.span, "..")).join(", "),
|
|
preserve_cloned.then(|| ".cloned()").unwrap_or_default(),
|
|
),
|
|
Applicability::MachineApplicable,
|
|
);
|
|
}
|