bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove the usize field from CandidateSource::AliasBound

Browse source
This commit is contained in:
Lenko Donchev 2023-01-27 22:50:24 -06:00
parent 7d4df2d30e
commit d4a816c813
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/solve/assembly.rs
View file

@ -76,7 +76,7 @@ pub(super) enum CandidateSource {
/// let _y = x.clone();
/// }
/// ```
AliasBound(usize),
AliasBound(),
}
pub(super) trait GoalKind<'tcx>: TypeFoldable<'tcx> + Copy + Eq {
@ -217,8 +217,6 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
// NOTE: Alternatively we could call `evaluate_goal` here and only have a `Normalized` candidate.
// This doesn't work as long as we use `CandidateSource` in winnowing.
let goal = goal.with(tcx, goal.predicate.with_self_ty(tcx, normalized_ty));
// FIXME: This is broken if we care about the `usize` of `AliasBound` because the self type
// could be normalized to yet another projection with different item bounds.
let normalized_candidates = self.assemble_and_evaluate_candidates(goal);
for mut normalized_candidate in normalized_candidates {
normalized_candidate.result =
@ -342,7 +340,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
ty::Alias(_, alias_ty) => alias_ty,
};
for (i, (assumption, _)) in self
for (_, (assumption, _)) in self
.tcx()
.bound_explicit_item_bounds(alias_ty.def_id)
.subst_iter_copied(self.tcx(), alias_ty.substs)
@ -350,7 +348,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
{
match G::consider_assumption(self, goal, assumption) {
Ok(result) => {
candidates.push(Candidate { source: CandidateSource::AliasBound(i), result })
candidates.push(Candidate { source: CandidateSource::AliasBound(), result })
}
Err(NoSolution) => (),
}

2
compiler/rustc_trait_selection/src/solve/project_goals.rs
View file

@ -171,7 +171,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
(CandidateSource::Impl(_), _)
| (CandidateSource::ParamEnv(_), _)
| (CandidateSource::BuiltinImpl, _)
| (CandidateSource::AliasBound(_), _) => unimplemented!(),
| (CandidateSource::AliasBound(), _) => unimplemented!(),
}
}
}

2
compiler/rustc_trait_selection/src/solve/trait_goals.rs
View file

@ -320,7 +320,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
match (candidate.source, other.source) {
(CandidateSource::Impl(_), _)
| (CandidateSource::ParamEnv(_), _)
| (CandidateSource::AliasBound(_), _)
| (CandidateSource::AliasBound(), _)
| (CandidateSource::BuiltinImpl, _) => unimplemented!(),
}
}