bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

loosen restriction on when GeneratorWitness: Clone

Browse source
This commit is contained in:
Andrew Cann 2022-03-14 10:24:10 +08:00 • committed by Charles Lew
parent 0228c073e0
commit a5cb3cca5e
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -1958,23 +1958,19 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
}
ty::GeneratorWitness(binder) => {
match binder.no_bound_vars() {
Some(tys) => {
let mut iter = tys.iter();
loop {
let ty = match iter.next() {
Some(ty) => ty,
Option::None => {
break Where(obligation.predicate.rebind(tys.to_vec()))
},
};
let resolved = self.infcx.shallow_resolve(ty);
if matches!(resolved.kind(), ty::Infer(ty::TyVar(_))) {
break Ambiguous;
}
}
},
Option::None => None,
let tys = self.tcx().erase_late_bound_regions(binder);
let mut iter = tys.iter();
loop {
let ty = match iter.next() {
Some(ty) => ty,
Option::None => {
break Where(obligation.predicate.rebind(tys.to_vec()))
},
};
let resolved = self.infcx.shallow_resolve(ty);
if matches!(resolved.kind(), ty::Infer(ty::TyVar(_))) {
break Ambiguous;
}
}
}