Skip to content

Commit 6738c1e

Browse files
BryanskiyBryanskiy
committed
Make DeepRejectCtxt symmetric with respect to TreatParams 
1 parent 0f442e2 commit 6738c1e

File tree

14 files changed

+235
-202
lines changed

14 files changed

+235
-202
lines changed

‎compiler/rustc_hir_analysis/src/coherence/inherent_impls.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ impl<'tcx> InherentCollect<'tcx> {
9090
}
9191
}
9292

93-
if let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::AsCandidateKey) {
93+
if let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::InstantiateWithInfer)
94+
{
9495
self.impls_map.incoherent_impls.entry(simp).or_default().push(impl_def_id);
9596
} else {
9697
bug!("unexpected self type: {:?}", self_ty);
@@ -129,7 +130,7 @@ impl<'tcx> InherentCollect<'tcx> {
129130
}
130131
}
131132

132-
if let Some(simp) = simplify_type(self.tcx, ty, TreatParams::AsCandidateKey) {
133+
if let Some(simp) = simplify_type(self.tcx, ty, TreatParams::InstantiateWithInfer) {
133134
self.impls_map.incoherent_impls.entry(simp).or_default().push(impl_def_id);
134135
} else {
135136
bug!("unexpected primitive type: {:?}", ty);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
714714
}
715715

716716
fn assemble_inherent_candidates_for_incoherent_ty(&mut self, self_ty: Ty<'tcx>) {
717-
let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::AsCandidateKey) else {
717+
let Some(simp) = simplify_type(self.tcx, self_ty, TreatParams::InstantiateWithInfer) else {
718718
bug!("unexpected incoherent type: {:?}", self_ty)
719719
};
720720
for &impl_def_id in self.tcx.incoherent_impls(simp).into_iter().flatten() {

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2234,8 +2234,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
22342234
let target_ty = self
22352235
.autoderef(sugg_span, rcvr_ty)
22362236
.find(|(rcvr_ty, _)| {
2237-
DeepRejectCtxt::new(self.tcx, TreatParams::ForLookup)
2238-
.types_may_unify(*rcvr_ty, impl_ty)
2237+
DeepRejectCtxt::new(
2238+
self.tcx,
2239+
TreatParams::AsRigid,
2240+
TreatParams::InstantiateWithInfer,
2241+
)
2242+
.types_may_unify(*rcvr_ty, impl_ty)
22392243
})
22402244
.map_or(impl_ty, |(ty, _)| ty)
22412245
.peel_refs();
@@ -2497,7 +2501,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
24972501
.into_iter()
24982502
.any(|info| self.associated_value(info.def_id, item_name).is_some());
24992503
let found_assoc = |ty: Ty<'tcx>| {
2500-
simplify_type(tcx, ty, TreatParams::AsCandidateKey)
2504+
simplify_type(tcx, ty, TreatParams::InstantiateWithInfer)
25012505
.and_then(|simp| {
25022506
tcx.incoherent_impls(simp)
25032507
.into_iter()
@@ -3927,7 +3931,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
39273931
// cases where a positive bound implies a negative impl.
39283932
(candidates, Vec::new())
39293933
} else if let Some(simp_rcvr_ty) =
3930-
simplify_type(self.tcx, rcvr_ty, TreatParams::ForLookup)
3934+
simplify_type(self.tcx, rcvr_ty, TreatParams::AsRigid)
39313935
{
39323936
let mut potential_candidates = Vec::new();
39333937
let mut explicitly_negative = Vec::new();
@@ -3945,7 +3949,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
39453949
.any(|header| {
39463950
let imp = header.trait_ref.instantiate_identity();
39473951
let imp_simp =
3948-
simplify_type(self.tcx, imp.self_ty(), TreatParams::ForLookup);
3952+
simplify_type(self.tcx, imp.self_ty(), TreatParams::AsRigid);
39493953
imp_simp.is_some_and(|s| s == simp_rcvr_ty)
39503954
})
39513955
{

‎compiler/rustc_metadata/src/rmeta/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
20172017
let simplified_self_ty = fast_reject::simplify_type(
20182018
self.tcx,
20192019
trait_ref.self_ty(),
2020-
TreatParams::AsCandidateKey,
2020+
TreatParams::InstantiateWithInfer,
20212021
);
20222022
trait_impls
20232023
.entry(trait_ref.def_id)

‎compiler/rustc_middle/src/ty/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ impl<'tcx> Interner for TyCtxt<'tcx> {
437437
let simp = ty::fast_reject::simplify_type(
438438
tcx,
439439
self_ty,
440-
ty::fast_reject::TreatParams::ForLookup,
440+
ty::fast_reject::TreatParams::AsRigid,
441441
)
442442
.unwrap();
443443
consider_impls_for_simplified_type(simp);

‎compiler/rustc_middle/src/ty/trait_def.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ impl<'tcx> TyCtxt<'tcx> {
168168
// whose outer level is not a parameter or projection. Especially for things like
169169
// `T: Clone` this is incredibly useful as we would otherwise look at all the impls
170170
// of `Clone` for `Option<T>`, `Vec<T>`, `ConcreteType` and so on.
171-
// Note that we're using `TreatParams::ForLookup` to query `non_blanket_impls` while using
172-
// `TreatParams::AsCandidateKey` while actually adding them.
173-
if let Some(simp) = fast_reject::simplify_type(self, self_ty, TreatParams::ForLookup) {
171+
// Note that we're using `TreatParams::AsRigid` to query `non_blanket_impls` while using
172+
// `TreatParams::InstantiateWithInfer` while actually adding them.
173+
if let Some(simp) = fast_reject::simplify_type(self, self_ty, TreatParams::AsRigid) {
174174
if let Some(impls) = impls.non_blanket_impls.get(&simp) {
175175
for &impl_def_id in impls {
176176
f(impl_def_id);
@@ -190,7 +190,9 @@ impl<'tcx> TyCtxt<'tcx> {
190190
self_ty: Ty<'tcx>,
191191
) -> impl Iterator<Item = DefId> + 'tcx {
192192
let impls = self.trait_impls_of(trait_def_id);
193-
if let Some(simp) = fast_reject::simplify_type(self, self_ty, TreatParams::AsCandidateKey) {
193+
if let Some(simp) =
194+
fast_reject::simplify_type(self, self_ty, TreatParams::InstantiateWithInfer)
195+
{
194196
if let Some(impls) = impls.non_blanket_impls.get(&simp) {
195197
return impls.iter().copied();
196198
}
@@ -239,7 +241,7 @@ pub(super) fn trait_impls_of_provider(tcx: TyCtxt<'_>, trait_id: DefId) -> Trait
239241
let impl_self_ty = tcx.type_of(impl_def_id).instantiate_identity();
240242

241243
if let Some(simplified_self_ty) =
242-
fast_reject::simplify_type(tcx, impl_self_ty, TreatParams::AsCandidateKey)
244+
fast_reject::simplify_type(tcx, impl_self_ty, TreatParams::InstantiateWithInfer)
243245
{
244246
impls.non_blanket_impls.entry(simplified_self_ty).or_default().push(impl_def_id);
245247
} else {

‎compiler/rustc_next_trait_solver/src/solve/normalizes_to/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,12 @@ where
144144

145145
let goal_trait_ref = goal.predicate.alias.trait_ref(cx);
146146
let impl_trait_ref = cx.impl_trait_ref(impl_def_id);
147-
if !DeepRejectCtxt::new(ecx.cx(), TreatParams::ForLookup).args_may_unify(
148-
goal.predicate.alias.trait_ref(cx).args,
149-
impl_trait_ref.skip_binder().args,
150-
) {
147+
if !DeepRejectCtxt::new(ecx.cx(), TreatParams::AsRigid, TreatParams::InstantiateWithInfer)
148+
.args_may_unify(
149+
goal.predicate.alias.trait_ref(cx).args,
150+
impl_trait_ref.skip_binder().args,
151+
)
152+
{
151153
return Err(NoSolution);
152154
}
153155

‎compiler/rustc_next_trait_solver/src/solve/trait_goals.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ where
4747
let cx = ecx.cx();
4848

4949
let impl_trait_ref = cx.impl_trait_ref(impl_def_id);
50-
if !DeepRejectCtxt::new(ecx.cx(), TreatParams::ForLookup)
50+
if !DeepRejectCtxt::new(ecx.cx(), TreatParams::AsRigid, TreatParams::InstantiateWithInfer)
5151
.args_may_unify(goal.predicate.trait_ref.args, impl_trait_ref.skip_binder().args)
5252
{
5353
return Err(NoSolution);

‎compiler/rustc_trait_selection/src/error_reporting/infer/note_and_explain.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,12 @@ impl<T> Trait<T> for X {
316316
{
317317
let mut has_matching_impl = false;
318318
tcx.for_each_relevant_impl(def_id, values.found, |did| {
319-
if DeepRejectCtxt::new(tcx, TreatParams::ForLookup)
320-
.types_may_unify(values.found, tcx.type_of(did).skip_binder())
319+
if DeepRejectCtxt::new(
320+
tcx,
321+
TreatParams::AsRigid,
322+
TreatParams::InstantiateWithInfer,
323+
)
324+
.types_may_unify(values.found, tcx.type_of(did).skip_binder())
321325
{
322326
has_matching_impl = true;
323327
}
@@ -337,8 +341,12 @@ impl<T> Trait<T> for X {
337341
{
338342
let mut has_matching_impl = false;
339343
tcx.for_each_relevant_impl(def_id, values.expected, |did| {
340-
if DeepRejectCtxt::new(tcx, TreatParams::ForLookup)
341-
.types_may_unify(values.expected, tcx.type_of(did).skip_binder())
344+
if DeepRejectCtxt::new(
345+
tcx,
346+
TreatParams::AsRigid,
347+
TreatParams::InstantiateWithInfer,
348+
)
349+
.types_may_unify(values.expected, tcx.type_of(did).skip_binder())
342350
{
343351
has_matching_impl = true;
344352
}
@@ -357,8 +365,12 @@ impl<T> Trait<T> for X {
357365
{
358366
let mut has_matching_impl = false;
359367
tcx.for_each_relevant_impl(def_id, values.found, |did| {
360-
if DeepRejectCtxt::new(tcx, TreatParams::ForLookup)
361-
.types_may_unify(values.found, tcx.type_of(did).skip_binder())
368+
if DeepRejectCtxt::new(
369+
tcx,
370+
TreatParams::AsRigid,
371+
TreatParams::InstantiateWithInfer,
372+
)
373+
.types_may_unify(values.found, tcx.type_of(did).skip_binder())
362374
{
363375
has_matching_impl = true;
364376
}

‎compiler/rustc_trait_selection/src/traits/coherence.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,11 @@ pub fn overlapping_impls(
9494
// Before doing expensive operations like entering an inference context, do
9595
// a quick check via fast_reject to tell if the impl headers could possibly
9696
// unify.
97-
let drcx = DeepRejectCtxt::new(tcx, TreatParams::AsCandidateKey);
97+
let drcx = DeepRejectCtxt::new(
98+
tcx,
99+
TreatParams::InstantiateWithInfer,
100+
TreatParams::InstantiateWithInfer,
101+
);
98102
let impl1_ref = tcx.impl_trait_ref(impl1_def_id);
99103
let impl2_ref = tcx.impl_trait_ref(impl2_def_id);
100104
let may_overlap = match (impl1_ref, impl2_ref) {

‎compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,11 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
580580
return;
581581
}
582582

583-
let drcx = DeepRejectCtxt::new(self.tcx(), TreatParams::ForLookup);
583+
let drcx = DeepRejectCtxt::new(
584+
self.tcx(),
585+
TreatParams::AsRigid,
586+
TreatParams::InstantiateWithInfer,
587+
);
584588
let obligation_args = obligation.predicate.skip_binder().trait_ref.args;
585589
self.tcx().for_each_relevant_impl(
586590
obligation.predicate.def_id(),

‎compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl<'tcx> Children {
4040
fn insert_blindly(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId) {
4141
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().skip_binder();
4242
if let Some(st) =
43-
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::AsCandidateKey)
43+
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::InstantiateWithInfer)
4444
{
4545
debug!("insert_blindly: impl_def_id={:?} st={:?}", impl_def_id, st);
4646
self.non_blanket_impls.entry(st).or_default().push(impl_def_id)
@@ -57,7 +57,7 @@ impl<'tcx> Children {
5757
let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().skip_binder();
5858
let vec: &mut Vec<DefId>;
5959
if let Some(st) =
60-
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::AsCandidateKey)
60+
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::InstantiateWithInfer)
6161
{
6262
debug!("remove_existing: impl_def_id={:?} st={:?}", impl_def_id, st);
6363
vec = self.non_blanket_impls.get_mut(&st).unwrap();
@@ -278,7 +278,7 @@ impl<'tcx> Graph {
278278
let mut parent = trait_def_id;
279279
let mut last_lint = None;
280280
let simplified =
281-
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::AsCandidateKey);
281+
fast_reject::simplify_type(tcx, trait_ref.self_ty(), TreatParams::InstantiateWithInfer);
282282

283283
// Descend the specialization tree, where `parent` is the current parent node.
284284
loop {

0 commit comments

Comments
 (0)