Skip to content

Commit c2cbf1d

Browse files
committed
Switch to comparing indices instead of names.
1 parent f4bc10b commit c2cbf1d

File tree

1 file changed

+11
-28
lines changed

1 file changed

+11
-28
lines changed

compiler/rustc_hir_analysis/src/check/wfcheck.rs

+11-28
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ use std::cell::LazyCell;
22
use std::ops::{ControlFlow, Deref};
33

44
use hir::intravisit::{self, Visitor};
5-
use itertools::Itertools;
65
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
76
use rustc_errors::codes::*;
87
use rustc_errors::{Applicability, ErrorGuaranteed, pluralize, struct_span_code_err};
8+
use rustc_hir::ItemKind;
99
use rustc_hir::def::{DefKind, Res};
1010
use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId};
1111
use rustc_hir::lang_items::LangItem;
12-
use rustc_hir::{GenericParamKind, ItemKind};
1312
use rustc_infer::infer::outlives::env::OutlivesEnvironment;
1413
use rustc_infer::infer::{self, InferCtxt, TyCtxtInferExt};
1514
use rustc_macros::LintDiagnostic;
@@ -378,7 +377,7 @@ fn check_trait_item<'tcx>(
378377
_ => (None, trait_item.span),
379378
};
380379
check_dyn_incompatible_self_trait_by_name(tcx, trait_item);
381-
let mut res = check_associated_item(tcx, def_id, span, method_sig, None);
380+
let mut res = check_associated_item(tcx, def_id, span, method_sig);
382381

383382
if matches!(trait_item.kind, hir::TraitItemKind::Fn(..)) {
384383
for &assoc_ty_def_id in tcx.associated_types_for_impl_traits_in_associated_fn(def_id) {
@@ -387,7 +386,6 @@ fn check_trait_item<'tcx>(
387386
assoc_ty_def_id.expect_local(),
388387
tcx.def_span(assoc_ty_def_id),
389388
None,
390-
None,
391389
));
392390
}
393391
}
@@ -905,13 +903,7 @@ fn check_impl_item<'tcx>(
905903
hir::ImplItemKind::Type(ty) if ty.span != DUMMY_SP => (None, ty.span),
906904
_ => (None, impl_item.span),
907905
};
908-
check_associated_item(
909-
tcx,
910-
impl_item.owner_id.def_id,
911-
span,
912-
method_sig,
913-
Some(impl_item.generics),
914-
)
906+
check_associated_item(tcx, impl_item.owner_id.def_id, span, method_sig)
915907
}
916908

917909
fn check_param_wf(tcx: TyCtxt<'_>, param: &hir::GenericParam<'_>) -> Result<(), ErrorGuaranteed> {
@@ -1049,7 +1041,6 @@ fn check_associated_item(
10491041
item_id: LocalDefId,
10501042
span: Span,
10511043
sig_if_method: Option<&hir::FnSig<'_>>,
1052-
generics: Option<&hir::Generics<'_>>,
10531044
) -> Result<(), ErrorGuaranteed> {
10541045
let loc = Some(WellFormedLoc::Ty(item_id));
10551046
enter_wf_checking_ctxt(tcx, span, item_id, |wfcx| {
@@ -1082,7 +1073,7 @@ fn check_associated_item(
10821073
hir_sig.decl,
10831074
item.def_id.expect_local(),
10841075
);
1085-
check_method_receiver(wfcx, hir_sig, item, self_ty, generics)
1076+
check_method_receiver(wfcx, hir_sig, item, self_ty)
10861077
}
10871078
ty::AssocKind::Type => {
10881079
if let ty::AssocItemContainer::TraitContainer = item.container {
@@ -1680,7 +1671,6 @@ fn check_method_receiver<'tcx>(
16801671
fn_sig: &hir::FnSig<'_>,
16811672
method: ty::AssocItem,
16821673
self_ty: Ty<'tcx>,
1683-
generics: Option<&hir::Generics<'_>>,
16841674
) -> Result<(), ErrorGuaranteed> {
16851675
let tcx = wfcx.tcx();
16861676

@@ -1714,6 +1704,7 @@ fn check_method_receiver<'tcx>(
17141704
} else {
17151705
None
17161706
};
1707+
let generics = tcx.generics_of(method.def_id);
17171708

17181709
let receiver_validity =
17191710
receiver_is_valid(wfcx, span, receiver_ty, self_ty, arbitrary_self_types_level, generics);
@@ -1801,19 +1792,11 @@ enum ReceiverValidityError {
18011792
/// method's type params.
18021793
fn confirm_type_is_not_a_method_generic_param(
18031794
ty: Ty<'_>,
1804-
method_generics: Option<&hir::Generics<'_>>,
1795+
method_generics: &ty::Generics,
18051796
) -> Result<(), ReceiverValidityError> {
18061797
if let ty::Param(param) = ty.kind() {
1807-
if let Some(generics) = method_generics {
1808-
if generics
1809-
.params
1810-
.iter()
1811-
.filter(|g| matches!(g.kind, GenericParamKind::Type { .. }))
1812-
.map(|g| g.name.ident().name)
1813-
.contains(&param.name)
1814-
{
1815-
return Err(ReceiverValidityError::MethodGenericParamUsed);
1816-
}
1798+
if (param.index as usize) >= method_generics.parent_count {
1799+
return Err(ReceiverValidityError::MethodGenericParamUsed);
18171800
}
18181801
}
18191802
Ok(())
@@ -1834,7 +1817,7 @@ fn receiver_is_valid<'tcx>(
18341817
receiver_ty: Ty<'tcx>,
18351818
self_ty: Ty<'tcx>,
18361819
arbitrary_self_types_enabled: Option<ArbitrarySelfTypesLevel>,
1837-
generics: Option<&hir::Generics<'_>>,
1820+
method_generics: &ty::Generics,
18381821
) -> Result<(), ReceiverValidityError> {
18391822
let infcx = wfcx.infcx;
18401823
let tcx = wfcx.tcx();
@@ -1850,7 +1833,7 @@ fn receiver_is_valid<'tcx>(
18501833
return Ok(());
18511834
}
18521835

1853-
confirm_type_is_not_a_method_generic_param(receiver_ty, generics)?;
1836+
confirm_type_is_not_a_method_generic_param(receiver_ty, method_generics)?;
18541837

18551838
let mut autoderef = Autoderef::new(infcx, wfcx.param_env, wfcx.body_def_id, span, receiver_ty);
18561839

@@ -1868,7 +1851,7 @@ fn receiver_is_valid<'tcx>(
18681851
potential_self_ty, self_ty
18691852
);
18701853

1871-
confirm_type_is_not_a_method_generic_param(potential_self_ty, generics)?;
1854+
confirm_type_is_not_a_method_generic_param(potential_self_ty, method_generics)?;
18721855

18731856
// Check if the self type unifies. If it does, then commit the result
18741857
// since it may have region side-effects.

0 commit comments

Comments
 (0)