bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use field-less variant for AliasBound.

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

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

@ -76,7 +76,7 @@ pub(super) enum CandidateSource {
/// let _y = x.clone(); /// let _y = x.clone();
/// } /// }
/// ``` /// ```
AliasBound(), AliasBound,
} }
pub(super) trait GoalKind<'tcx>: TypeFoldable<'tcx> + Copy + Eq { pub(super) trait GoalKind<'tcx>: TypeFoldable<'tcx> + Copy + Eq {
@ -340,15 +340,14 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
ty::Alias(_, alias_ty) => alias_ty, ty::Alias(_, alias_ty) => alias_ty,
}; };
for (_, (assumption, _)) in self for (assumption, _) in self
.tcx() .tcx()
.bound_explicit_item_bounds(alias_ty.def_id) .bound_explicit_item_bounds(alias_ty.def_id)
.subst_iter_copied(self.tcx(), alias_ty.substs) .subst_iter_copied(self.tcx(), alias_ty.substs)
.enumerate()
{ {
match G::consider_assumption(self, goal, assumption) { match G::consider_assumption(self, goal, assumption) {
Ok(result) => { Ok(result) => {
candidates.push(Candidate { source: CandidateSource::AliasBound(), result }) candidates.push(Candidate { source: CandidateSource::AliasBound, result })
} }
Err(NoSolution) => (), 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::Impl(_), _)
| (CandidateSource::ParamEnv(_), _) | (CandidateSource::ParamEnv(_), _)
| (CandidateSource::BuiltinImpl, _) | (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) { match (candidate.source, other.source) {
(CandidateSource::Impl(_), _) (CandidateSource::Impl(_), _)
| (CandidateSource::ParamEnv(_), _) | (CandidateSource::ParamEnv(_), _)
| (CandidateSource::AliasBound(), _) | (CandidateSource::AliasBound, _)
| (CandidateSource::BuiltinImpl, _) => unimplemented!(), | (CandidateSource::BuiltinImpl, _) => unimplemented!(),
} }
} }