Auto merge of #49704 - leodasvacas:fix-#49344, r=nikomatsakis
Fix regression in defaults #49344 Fixes #49344 by not checking the well-formedness wrt defaults of predicates that contain lifetimes, which is consistent with not checking generic predicates. r? @nikomatsakis
This commit is contained in:
commit
08ad376e48
@ -423,12 +423,18 @@ fn check_where_clauses<'a, 'gcx, 'fcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'gcx>,
|
||||
_ => t.super_visit_with(self)
|
||||
}
|
||||
}
|
||||
|
||||
fn visit_region(&mut self, _: ty::Region<'tcx>) -> bool {
|
||||
true
|
||||
}
|
||||
}
|
||||
let mut param_count = CountParams { params: FxHashSet() };
|
||||
pred.visit_with(&mut param_count);
|
||||
let has_region = pred.visit_with(&mut param_count);
|
||||
let substituted_pred = pred.subst(fcx.tcx, substs);
|
||||
// Don't check non-defaulted params, dependent defaults or preds with multiple params.
|
||||
if substituted_pred.references_error() || param_count.params.len() > 1 {
|
||||
// Don't check non-defaulted params, dependent defaults (including lifetimes)
|
||||
// or preds with multiple params.
|
||||
if substituted_pred.references_error() || param_count.params.len() > 1
|
||||
|| has_region {
|
||||
continue;
|
||||
}
|
||||
// Avoid duplication of predicates that contain no parameters, for example.
|
||||
|
@ -27,4 +27,8 @@ trait SelfBound<T: Copy=Self> {}
|
||||
// Not even for well-formedness.
|
||||
struct WellFormedProjection<A, T=<A as Iterator>::Item>(A, T);
|
||||
|
||||
// Issue #49344, predicates with lifetimes should not be checked.
|
||||
trait Scope<'a> {}
|
||||
struct Request<'a, S: Scope<'a> = i32>(S, &'a ());
|
||||
|
||||
fn main() {}
|
||||
|
Loading…
x
Reference in New Issue
Block a user