Rollup merge of #91321 - matthewjasper:constaint-placeholders, r=jackh726
Handle placeholder regions in NLL type outlive constraints Closes #76168
This commit is contained in:
commit
b56e3d955a
@ -6,6 +6,7 @@
|
|||||||
use rustc_infer::infer::{self, InferCtxt, SubregionOrigin};
|
use rustc_infer::infer::{self, InferCtxt, SubregionOrigin};
|
||||||
use rustc_middle::mir::ConstraintCategory;
|
use rustc_middle::mir::ConstraintCategory;
|
||||||
use rustc_middle::ty::subst::GenericArgKind;
|
use rustc_middle::ty::subst::GenericArgKind;
|
||||||
|
use rustc_middle::ty::TypeFoldable;
|
||||||
use rustc_middle::ty::{self, TyCtxt};
|
use rustc_middle::ty::{self, TyCtxt};
|
||||||
use rustc_span::DUMMY_SP;
|
use rustc_span::DUMMY_SP;
|
||||||
|
|
||||||
@ -95,11 +96,23 @@ pub(super) fn convert(&mut self, query_constraint: &QueryOutlivesConstraint<'tcx
|
|||||||
self.add_outlives(r1_vid, r2_vid);
|
self.add_outlives(r1_vid, r2_vid);
|
||||||
}
|
}
|
||||||
|
|
||||||
GenericArgKind::Type(t1) => {
|
GenericArgKind::Type(mut t1) => {
|
||||||
// we don't actually use this for anything, but
|
// we don't actually use this for anything, but
|
||||||
// the `TypeOutlives` code needs an origin.
|
// the `TypeOutlives` code needs an origin.
|
||||||
let origin = infer::RelateParamBound(DUMMY_SP, t1, None);
|
let origin = infer::RelateParamBound(DUMMY_SP, t1, None);
|
||||||
|
|
||||||
|
// Placeholder regions need to be converted now because it may
|
||||||
|
// create new region variables, which can't be done later when
|
||||||
|
// verifying these bounds.
|
||||||
|
if t1.has_placeholders() {
|
||||||
|
t1 = tcx.fold_regions(&t1, &mut false, |r, _| match *r {
|
||||||
|
ty::RegionKind::RePlaceholder(placeholder) => {
|
||||||
|
self.constraints.placeholder_region(self.infcx, placeholder)
|
||||||
|
}
|
||||||
|
_ => r,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
TypeOutlives::new(
|
TypeOutlives::new(
|
||||||
&mut *self,
|
&mut *self,
|
||||||
tcx,
|
tcx,
|
||||||
|
19
src/test/ui/lifetimes/issue-76168-hr-outlives.rs
Normal file
19
src/test/ui/lifetimes/issue-76168-hr-outlives.rs
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
// edition:2018
|
||||||
|
// check-pass
|
||||||
|
|
||||||
|
#![feature(unboxed_closures)]
|
||||||
|
use std::future::Future;
|
||||||
|
|
||||||
|
async fn wrapper<F>(f: F)
|
||||||
|
where for<'a> F: FnOnce<(&'a mut i32,)>,
|
||||||
|
for<'a> <F as FnOnce<(&'a mut i32,)>>::Output: Future<Output=()> + 'a
|
||||||
|
{
|
||||||
|
let mut i = 41;
|
||||||
|
f(&mut i).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn add_one(i: &mut i32) {
|
||||||
|
*i = *i + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
Reference in New Issue
Block a user