Skip to content

Commit 6ea822c

Browse files
oli-obkoli-obk
committed
Make Iterator a lang item
1 parent 4c11e0e commit 6ea822c

File tree

23 files changed

+34
-28
lines changed

23 files changed

+34
-28
lines changed

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
14141414
&& let Some(loop_span) = finder.loop_span
14151415
&& let Some(def_id) = typeck_results.type_dependent_def_id(body_expr.hir_id)
14161416
&& let Some(trait_did) = tcx.trait_of_item(def_id)
1417-
&& tcx.is_diagnostic_item(sym::Iterator, trait_did)
1417+
&& tcx.lang_items().iterator_trait() == Some(trait_did)
14181418
{
14191419
if let Some(loop_bind) = finder.loop_bind {
14201420
err.note(format!(
@@ -2457,7 +2457,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
24572457
let return_ty = self.regioncx.universal_regions().unnormalized_output_ty;
24582458

24592459
// to avoid panics
2460-
if let Some(iter_trait) = tcx.get_diagnostic_item(sym::Iterator)
2460+
if let Some(iter_trait) = tcx.lang_items().iterator_trait()
24612461
&& self
24622462
.infcx
24632463
.type_implements_trait(iter_trait, [return_ty], self.param_env)

‎compiler/rustc_hir/src/lang_items.rs

+1
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ language_item_table! {
210210

211211
FnOnceOutput, sym::fn_once_output, fn_once_output, Target::AssocTy, GenericRequirement::None;
212212

213+
Iterator, sym::iterator, iterator_trait, Target::Trait, GenericRequirement::Exact(0);
213214
Future, sym::future_trait, future_trait, Target::Trait, GenericRequirement::Exact(0);
214215
CoroutineState, sym::coroutine_state, gen_state, Target::Enum, GenericRequirement::None;
215216
Coroutine, sym::coroutine, gen_trait, Target::Trait, GenericRequirement::Minimum(1);

‎compiler/rustc_hir_analysis/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ fn suggest_impl_trait<'tcx>(
12941294

12951295
for (trait_def_id, assoc_item_def_id, formatter) in [
12961296
(
1297-
tcx.get_diagnostic_item(sym::Iterator),
1297+
tcx.lang_items().iterator_trait(),
12981298
tcx.get_diagnostic_item(sym::IteratorItem),
12991299
format_as_assoc,
13001300
),

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
549549
} else {
550550
err.span_label(span, msg);
551551
}
552-
if let Some(iterator_trait) = self.tcx.get_diagnostic_item(sym::Iterator) {
552+
if let Some(iterator_trait) = self.tcx.lang_items().iterator_trait() {
553553
let iterator_trait = self.tcx.def_path_str(iterator_trait);
554554
err.note(format!(
555555
"`count` is defined on `{iterator_trait}`, which `{rcvr_ty}` does not implement"

‎compiler/rustc_interface/src/passes.rs

+3
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,9 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
852852
// This check has to be run after all lints are done processing. We don't
853853
// define a lint filter, as all lint checks should have finished at this point.
854854
sess.time("check_lint_expectations", || tcx.ensure().check_expectations(None));
855+
856+
// Make sure we check for diagnostic item conflicts between different crates.
857+
let _ = tcx.all_diagnostic_items(());
855858
});
856859

857860
if sess.opts.unstable_opts.print_vtable_sizes {

‎compiler/rustc_lint/src/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingCopyImplementations {
685685

686686
// We shouldn't recommend implementing `Copy` on stateful things,
687687
// such as iterators.
688-
if let Some(iter_trait) = cx.tcx.get_diagnostic_item(sym::Iterator)
688+
if let Some(iter_trait) = cx.tcx.lang_items().iterator_trait()
689689
&& cx
690690
.tcx
691691
.infer_ctxt()

‎compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
15221522
"expected `{self_ty}` to be a future that resolves to `{expected_ty}`, but it \
15231523
resolves to `{normalized_ty}`"
15241524
))
1525-
} else if Some(trait_def_id) == self.tcx.get_diagnostic_item(sym::Iterator) {
1525+
} else if Some(trait_def_id) == self.tcx.lang_items().iterator_trait() {
15261526
Some(format!(
15271527
"expected `{self_ty}` to be an iterator that yields `{expected_ty}`, but it \
15281528
yields `{normalized_ty}`"

‎library/core/src/iter/traits/iterator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn _assert_is_object_safe(_: &dyn Iterator<Item = ()>) {}
6969
message = "`{Self}` is not an iterator"
7070
)]
7171
#[doc(notable_trait)]
72-
#[rustc_diagnostic_item = "Iterator"]
72+
#[cfg_attr(not(bootstrap), lang = "iterator")]
7373
#[must_use = "iterators are lazy and do nothing unless consumed"]
7474
pub trait Iterator {
7575
/// The type of the elements being iterated over.

‎src/tools/clippy/clippy_lints/src/blocks_in_if_conditions.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use rustc_hir::{BlockCheckMode, Expr, ExprKind};
1010
use rustc_lint::{LateContext, LateLintPass, LintContext};
1111
use rustc_middle::lint::in_external_macro;
1212
use rustc_session::{declare_lint_pass, declare_tool_lint};
13-
use rustc_span::sym;
1413

1514
declare_clippy_lint! {
1615
/// ### What it does
@@ -118,7 +117,7 @@ impl<'tcx> LateLintPass<'tcx> for BlocksInIfConditions {
118117
if let Some(parent) = get_parent_expr(cx, e);
119118
if let ExprKind::MethodCall(_, self_arg, _, _) = &parent.kind;
120119
let caller = cx.typeck_results().expr_ty(self_arg);
121-
if let Some(iter_id) = cx.tcx.get_diagnostic_item(sym::Iterator);
120+
if let Some(iter_id) = cx.tcx.lang_items().iterator_trait();
122121
if implements_trait(cx, caller, iter_id, &[]);
123122
then {
124123
return ControlFlow::Continue(Descend::No);

‎src/tools/clippy/clippy_lints/src/copy_iterator.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use clippy_utils::ty::is_copy;
33
use rustc_hir::{Impl, Item, ItemKind};
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
6-
use rustc_span::sym;
76

87
use if_chain::if_chain;
98

@@ -46,7 +45,7 @@ impl<'tcx> LateLintPass<'tcx> for CopyIterator {
4645
let ty = cx.tcx.type_of(item.owner_id).instantiate_identity();
4746
if is_copy(cx, ty);
4847
if let Some(trait_id) = trait_ref.trait_def_id();
49-
if cx.tcx.is_diagnostic_item(sym::Iterator, trait_id);
48+
if cx.tcx.lang_items().iterator_trait() == Some(trait_id);
5049
then {
5150
span_lint_and_note(
5251
cx,

‎src/tools/clippy/clippy_lints/src/iter_not_returning_iterator.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use rustc_hir::def_id::LocalDefId;
55
use rustc_hir::{FnSig, ImplItem, ImplItemKind, Item, ItemKind, Node, TraitItem, TraitItemKind};
66
use rustc_lint::{LateContext, LateLintPass};
77
use rustc_session::{declare_lint_pass, declare_tool_lint};
8-
use rustc_span::symbol::sym;
98

109
declare_clippy_lint! {
1110
/// ### What it does
@@ -78,7 +77,7 @@ fn check_sig(cx: &LateContext<'_>, name: &str, sig: &FnSig<'_>, fn_id: LocalDefI
7877
.unwrap_or(ret_ty);
7978
if cx
8079
.tcx
81-
.get_diagnostic_item(sym::Iterator)
80+
.lang_items().iterator_trait()
8281
.map_or(false, |iter_id| !implements_trait(cx, ret_ty, iter_id, &[]))
8382
{
8483
span_lint(

‎src/tools/clippy/clippy_lints/src/iter_without_into_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ impl {self_ty_without_ref} {{
212212
)
213213
&& let ref_ty = sig.inputs()[0]
214214
&& let Some(into_iter_did) = cx.tcx.get_diagnostic_item(sym::IntoIterator)
215-
&& let Some(iterator_did) = cx.tcx.get_diagnostic_item(sym::Iterator)
215+
&& let Some(iterator_did) = cx.tcx.lang_items().iterator_trait()
216216
&& let ret_ty = sig.output()
217217
// Order is important here, we need to check that the `fn iter` return type actually implements `IntoIterator`
218218
// *before* normalizing `<_ as IntoIterator>::Item` (otherwise make_normalized_projection ICEs)

‎src/tools/clippy/clippy_lints/src/loops/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_lint::LateContext;
99
use rustc_middle::hir::nested_filter;
1010
use rustc_middle::ty::{self, Ty};
1111
use rustc_span::source_map::Spanned;
12-
use rustc_span::symbol::{sym, Symbol};
12+
use rustc_span::symbol::{Symbol};
1313
use std::iter::Iterator;
1414

1515
#[derive(Debug, PartialEq, Eq)]
@@ -316,7 +316,7 @@ impl<'tcx> Visitor<'tcx> for LoopNestVisitor {
316316
/// If `arg` was the argument to a `for` loop, return the "cleanest" way of writing the
317317
/// actual `Iterator` that the loop uses.
318318
pub(super) fn make_iterator_snippet(cx: &LateContext<'_>, arg: &Expr<'_>, applic_ref: &mut Applicability) -> String {
319-
let impls_iterator = cx.tcx.get_diagnostic_item(sym::Iterator).map_or(false, |id| {
319+
let impls_iterator = cx.tcx.lang_items().iterator_trait().map_or(false, |id| {
320320
implements_trait(cx, cx.typeck_results().expr_ty(arg), id, &[])
321321
});
322322
if impls_iterator {

‎src/tools/clippy/clippy_lints/src/methods/filter_next.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use rustc_ast::{BindingAnnotation, Mutability};
55
use rustc_errors::Applicability;
66
use rustc_hir as hir;
77
use rustc_lint::LateContext;
8-
use rustc_span::sym;
98

109
use super::FILTER_NEXT;
1110

@@ -32,7 +31,7 @@ pub(super) fn check<'tcx>(
3231
filter_arg: &'tcx hir::Expr<'_>,
3332
) {
3433
// lint if caller of `.filter().next()` is an Iterator
35-
let recv_impls_iterator = cx.tcx.get_diagnostic_item(sym::Iterator).map_or(false, |id| {
34+
let recv_impls_iterator = cx.tcx.lang_items().iterator_trait().map_or(false, |id| {
3635
implements_trait(cx, cx.typeck_results().expr_ty(recv), id, &[])
3736
});
3837
if recv_impls_iterator {

‎src/tools/clippy/clippy_lints/src/methods/from_iter_instead_of_collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, args: &[hir::Exp
1616
if is_path_diagnostic_item(cx, func, sym::from_iter_fn);
1717
let ty = cx.typeck_results().expr_ty(expr);
1818
let arg_ty = cx.typeck_results().expr_ty(&args[0]);
19-
if let Some(iter_id) = cx.tcx.get_diagnostic_item(sym::Iterator);
19+
if let Some(iter_id) = cx.tcx.lang_items().iterator_trait();
2020

2121
if implements_trait(cx, arg_ty, iter_id, &[]);
2222
then {

‎src/tools/clippy/clippy_lints/src/methods/iter_overeager_cloned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub(super) fn check<'tcx>(
4343
needs_into_iter: bool,
4444
) {
4545
let typeck = cx.typeck_results();
46-
if let Some(iter_id) = cx.tcx.get_diagnostic_item(sym::Iterator)
46+
if let Some(iter_id) = cx.tcx.lang_items().iterator_trait()
4747
&& let Some(method_id) = typeck.type_dependent_def_id(expr.hir_id)
4848
&& cx.tcx.trait_of_item(method_id) == Some(iter_id)
4949
&& let Some(method_id) = typeck.type_dependent_def_id(cloned_call.hir_id)

‎src/tools/clippy/clippy_lints/src/methods/manual_str_repeat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub(super) fn check(
6060
if is_path_diagnostic_item(cx, repeat_fn, sym::iter_repeat);
6161
if is_type_lang_item(cx, cx.typeck_results().expr_ty(collect_expr), LangItem::String);
6262
if let Some(take_id) = cx.typeck_results().type_dependent_def_id(take_expr.hir_id);
63-
if let Some(iter_trait_id) = cx.tcx.get_diagnostic_item(sym::Iterator);
63+
if let Some(iter_trait_id) = cx.tcx.lang_items().iterator_trait();
6464
if cx.tcx.trait_of_item(take_id) == Some(iter_trait_id);
6565
if let Some(repeat_kind) = parse_repeat_arg(cx, repeat_arg);
6666
let ctxt = collect_expr.span.ctxt();

‎src/tools/clippy/clippy_lints/src/methods/needless_collect.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ fn is_is_empty_sig(cx: &LateContext<'_>, call_id: HirId) -> bool {
208208
/// Checks if `<iter_ty as Iterator>::Item` is the same as `<collect_ty as IntoIter>::Item`
209209
fn iterates_same_ty<'tcx>(cx: &LateContext<'tcx>, iter_ty: Ty<'tcx>, collect_ty: Ty<'tcx>) -> bool {
210210
let item = Symbol::intern("Item");
211-
if let Some(iter_trait) = cx.tcx.get_diagnostic_item(sym::Iterator)
211+
if let Some(iter_trait) = cx.tcx.lang_items().iterator_trait()
212212
&& let Some(into_iter_trait) = cx.tcx.get_diagnostic_item(sym::IntoIterator)
213213
&& let Some(iter_item_ty) = make_normalized_projection(cx.tcx, cx.param_env, iter_trait, item, [iter_ty])
214214
&& let Some(into_iter_item_proj) = make_projection(cx.tcx, into_iter_trait, item, [collect_ty])
@@ -232,7 +232,7 @@ fn is_contains_sig(cx: &LateContext<'_>, call_id: HirId, iter_expr: &Expr<'_>) -
232232
&& sig.skip_binder().output().is_bool()
233233
&& let [_, search_ty] = *sig.skip_binder().inputs()
234234
&& let ty::Ref(_, search_ty, Mutability::Not) = *cx.tcx.erase_late_bound_regions(sig.rebind(search_ty)).kind()
235-
&& let Some(iter_trait) = cx.tcx.get_diagnostic_item(sym::Iterator)
235+
&& let Some(iter_trait) = cx.tcx.lang_items().iterator_trait()
236236
&& let Some(iter_item) = cx.tcx
237237
.associated_items(iter_trait)
238238
.find_by_name_and_kind(cx.tcx, Ident::with_dummy_span(Symbol::intern("Item")), AssocKind::Type, iter_trait)

‎src/tools/clippy/clippy_lints/src/methods/str_splitn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ fn parse_iter_usage<'tcx>(
293293
return None;
294294
};
295295
let did = cx.typeck_results().type_dependent_def_id(e.hir_id)?;
296-
let iter_id = cx.tcx.get_diagnostic_item(sym::Iterator)?;
296+
let iter_id = cx.tcx.lang_items().iterator_trait()?;
297297

298298
match (name.ident.as_str(), args) {
299299
("next", []) if cx.tcx.trait_of_item(did) == Some(iter_id) => (IterUsageKind::Nth(0), e.span),

‎src/tools/clippy/clippy_lints/src/methods/unnecessary_iter_cloned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn check_for_loop_iter(
4747
if let ExprKind::MethodCall(maybe_iter_method_name, collection, [], _) = receiver.kind;
4848
if maybe_iter_method_name.ident.name == sym::iter;
4949

50-
if let Some(iterator_trait_id) = cx.tcx.get_diagnostic_item(sym::Iterator);
50+
if let Some(iterator_trait_id) = cx.tcx.lang_items().iterator_trait();
5151
let receiver_ty = cx.typeck_results().expr_ty(receiver);
5252
if implements_trait(cx, receiver_ty, iterator_trait_id, &[]);
5353
if let Some(iter_item_ty) = get_iterator_item_ty(cx, receiver_ty);

‎src/tools/clippy/clippy_lints/src/methods/unnecessary_to_owned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ fn check_into_iter_call_arg(
212212
if let Some(parent) = get_parent_expr(cx, expr);
213213
if let Some(callee_def_id) = fn_def_id(cx, parent);
214214
if is_into_iter(cx, callee_def_id);
215-
if let Some(iterator_trait_id) = cx.tcx.get_diagnostic_item(sym::Iterator);
215+
if let Some(iterator_trait_id) = cx.tcx.lang_items().iterator_trait();
216216
let parent_ty = cx.typeck_results().expr_ty(parent);
217217
if implements_trait(cx, parent_ty, iterator_trait_id, &[]);
218218
if let Some(item_ty) = get_iterator_item_ty(cx, parent_ty);

‎src/tools/clippy/clippy_utils/src/lib.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,13 @@ pub fn is_diag_item_method(cx: &LateContext<'_>, def_id: DefId, diag_item: Symbo
314314
/// Checks if a method is in a diagnostic item trait
315315
pub fn is_diag_trait_item(cx: &LateContext<'_>, def_id: DefId, diag_item: Symbol) -> bool {
316316
if let Some(trait_did) = cx.tcx.trait_of_item(def_id) {
317-
return cx.tcx.is_diagnostic_item(diag_item, trait_did);
317+
// `Iterator` is a lang item, not a diag item, but we'd like to check for `Iterator` methods
318+
// the same way we check for other traits' methods.
319+
if diag_item == sym::Iterator {
320+
return cx.tcx.lang_items().iterator_trait() == Some(trait_did)
321+
} else {
322+
return cx.tcx.is_diagnostic_item(diag_item, trait_did);
323+
}
318324
}
319325
false
320326
}

‎src/tools/clippy/clippy_utils/src/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pub fn contains_ty_adt_constructor_opaque<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'
141141
/// Do not invoke without first verifying that the type implements `Iterator`
142142
pub fn get_iterator_item_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'tcx>> {
143143
cx.tcx
144-
.get_diagnostic_item(sym::Iterator)
144+
.lang_items().iterator_trait()
145145
.and_then(|iter_did| cx.get_associated_type(ty, iter_did, "Item"))
146146
}
147147

0 commit comments

Comments
 (0)