Skip to content

Commit c0373f5

Browse files
committed
Auto merge of rust-lang#108112 - nnethercote:clarify-iterator-interners, r=oli-obk,compiler-errors
Clarify iterator interners I found the iterator interners very confusing. This PR clarifies things. r? `@compiler-errors`
2 parents 8a66a68 + a3837c6 commit c0373f5

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

clippy_lints/src/methods/needless_collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ fn is_contains_sig(cx: &LateContext<'_>, call_id: HirId, iter_expr: &Expr<'_>) -
173173
&& let Some(iter_item) = cx.tcx
174174
.associated_items(iter_trait)
175175
.find_by_name_and_kind(cx.tcx, Ident::with_dummy_span(Symbol::intern("Item")), AssocKind::Type, iter_trait)
176-
&& let substs = cx.tcx.mk_substs([GenericArg::from(typeck.expr_ty_adjusted(iter_expr))].into_iter())
176+
&& let substs = cx.tcx.intern_substs(&[GenericArg::from(typeck.expr_ty_adjusted(iter_expr))])
177177
&& let proj_ty = cx.tcx.mk_projection(iter_item.def_id, substs)
178178
&& let Ok(item_ty) = cx.tcx.try_normalize_erasing_regions(cx.param_env, proj_ty)
179179
{

clippy_lints/src/redundant_slicing.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ use rustc_middle::ty::adjustment::{Adjust, AutoBorrow, AutoBorrowMutability};
1111
use rustc_middle::ty::subst::GenericArg;
1212
use rustc_session::{declare_lint_pass, declare_tool_lint};
1313

14-
use std::iter;
15-
1614
declare_clippy_lint! {
1715
/// ### What it does
1816
/// Checks for redundant slicing expressions which use the full range, and
@@ -136,7 +134,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantSlicing {
136134
} else if let Some(target_id) = cx.tcx.lang_items().deref_target() {
137135
if let Ok(deref_ty) = cx.tcx.try_normalize_erasing_regions(
138136
cx.param_env,
139-
cx.tcx.mk_projection(target_id, cx.tcx.mk_substs(iter::once(GenericArg::from(indexed_ty)))),
137+
cx.tcx.mk_projection(target_id, cx.tcx.intern_substs(&[GenericArg::from(indexed_ty)])),
140138
) {
141139
if deref_ty == expr_ty {
142140
let snip = snippet_with_context(cx, indexed.span, ctxt, "..", &mut app).0;

0 commit comments

Comments
 (0)