-use crate::utils::{is_copy, match_path, paths, span_note_and_lint};
-use rustc_hir::{Item, ItemKind};
+use crate::utils::{is_copy, match_path, paths, span_lint_and_note};
+use rustc_hir::{Impl, Item, ItemKind};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint};
declare_lint_pass!(CopyIterator => [COPY_ITERATOR]);
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for CopyIterator {
- fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item<'_>) {
- if let ItemKind::Impl {
+impl<'tcx> LateLintPass<'tcx> for CopyIterator {
+ fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'_>) {
+ if let ItemKind::Impl(Impl {
of_trait: Some(ref trait_ref),
..
- } = item.kind
+ }) = item.kind
{
- let ty = cx.tcx.type_of(cx.tcx.hir().local_def_id(item.hir_id));
+ let ty = cx.tcx.type_of(item.def_id);
if is_copy(cx, ty) && match_path(&trait_ref.path, &paths::ITERATOR) {
- span_note_and_lint(
+ span_lint_and_note(
cx,
COPY_ITERATOR,
item.span,
"you are implementing `Iterator` on a `Copy` type",
- item.span,
+ None,
"consider implementing `IntoIterator` instead",
);
}