mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-28 02:57:37 +00:00
Rollup merge of #108843 - compiler-errors:non_lifetime_binders-method-probe, r=jackh726
Instantiate instead of erasing binder when probing param methods Fixes #108836 There is a really old comment saying that a `WhereClauseCandidate` probe candidate "should not contain any inference variables", but I'm not really confident that that comment applies anymore. In contrast, other candidates that we assemble during method probe contain inference variables in their substitutions (e.g. `InherentImplCandidate`)... Since this change is made only to support a nightly feature, I'm happy to gate the new behavior behind this feature flag or discuss it further. r? types
This commit is contained in:
commit
4e165c1c99
@ -793,6 +793,14 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
|
||||
// a `&self` method will wind up with an argument type like `&dyn Trait`.
|
||||
let trait_ref = principal.with_self_ty(self.tcx, self_ty);
|
||||
self.elaborate_bounds(iter::once(trait_ref), |this, new_trait_ref, item| {
|
||||
if new_trait_ref.has_non_region_late_bound() {
|
||||
this.tcx.sess.delay_span_bug(
|
||||
this.span,
|
||||
"tried to select method from HRTB with non-lifetime bound vars",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
let new_trait_ref = this.erase_late_bound_regions(new_trait_ref);
|
||||
|
||||
let (xform_self_ty, xform_ret_ty) =
|
||||
@ -843,18 +851,15 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
|
||||
});
|
||||
|
||||
self.elaborate_bounds(bounds, |this, poly_trait_ref, item| {
|
||||
let trait_ref = this.erase_late_bound_regions(poly_trait_ref);
|
||||
let trait_ref = this.instantiate_binder_with_fresh_vars(
|
||||
this.span,
|
||||
infer::LateBoundRegionConversionTime::FnCall,
|
||||
poly_trait_ref,
|
||||
);
|
||||
|
||||
let (xform_self_ty, xform_ret_ty) =
|
||||
this.xform_self_ty(item, trait_ref.self_ty(), trait_ref.substs);
|
||||
|
||||
// Because this trait derives from a where-clause, it
|
||||
// should not contain any inference variables or other
|
||||
// artifacts. This means it is safe to put into the
|
||||
// `WhereClauseCandidate` and (eventually) into the
|
||||
// `WhereClausePick`.
|
||||
assert!(!trait_ref.substs.needs_infer());
|
||||
|
||||
this.push_candidate(
|
||||
Candidate {
|
||||
xform_self_ty,
|
||||
@ -964,7 +969,11 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
|
||||
bound_trait_ref.def_id(),
|
||||
));
|
||||
} else {
|
||||
let new_trait_ref = self.erase_late_bound_regions(bound_trait_ref);
|
||||
let new_trait_ref = self.instantiate_binder_with_fresh_vars(
|
||||
self.span,
|
||||
infer::LateBoundRegionConversionTime::FnCall,
|
||||
bound_trait_ref,
|
||||
);
|
||||
|
||||
let (xform_self_ty, xform_ret_ty) =
|
||||
self.xform_self_ty(item, new_trait_ref.self_ty(), new_trait_ref.substs);
|
||||
|
16
tests/ui/traits/non_lifetime_binders/method-probe.rs
Normal file
16
tests/ui/traits/non_lifetime_binders/method-probe.rs
Normal file
@ -0,0 +1,16 @@
|
||||
// check-pass
|
||||
|
||||
#![feature(non_lifetime_binders)]
|
||||
//~^ WARN the feature `non_lifetime_binders` is incomplete
|
||||
|
||||
trait Foo: for<T> Bar<T> {}
|
||||
|
||||
trait Bar<T> {
|
||||
fn method() -> T;
|
||||
}
|
||||
|
||||
fn x<T: Foo>() {
|
||||
let _: i32 = T::method();
|
||||
}
|
||||
|
||||
fn main() {}
|
11
tests/ui/traits/non_lifetime_binders/method-probe.stderr
Normal file
11
tests/ui/traits/non_lifetime_binders/method-probe.stderr
Normal file
@ -0,0 +1,11 @@
|
||||
warning: the feature `non_lifetime_binders` is incomplete and may not be safe to use and/or cause compiler crashes
|
||||
--> $DIR/method-probe.rs:3:12
|
||||
|
|
||||
LL | #![feature(non_lifetime_binders)]
|
||||
| ^^^^^^^^^^^^^^^^^^^^
|
||||
|
|
||||
= note: see issue #108185 <https://github.com/rust-lang/rust/issues/108185> for more information
|
||||
= note: `#[warn(incomplete_features)]` on by default
|
||||
|
||||
warning: 1 warning emitted
|
||||
|
Loading…
Reference in New Issue
Block a user