mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-28 02:57:37 +00:00
Auto merge of #117884 - bvanjoi:fix-117794, r=compiler-errors
skip rpit constraint checker if borrowck return type error Fixes #117794 Fixes #117886 Fixes #119025 Prior to change #117418, the value of `concrete_opaque_types` for `mir_borrock(T:🅰️:opaque)` was `None`. However, due to modifications in `body.local_decls`, the return value had been changed. The changed of `body.local_decls` has let to the addition of `ty:Error` to `infcx.opaque_type_storage.opaque_types` during `TypeChecker::equate_inputs_and_outputs`. This is due to it utilizing the output of a function signature that was appended during `construct_error`(which previously only appended a `ty::Error`) and then execute `TypeChecker::Related_types`. Therefore, in this PR, I've implemented a condition to bypass the rpit check when an error is encountered. r? `@compiler-errors`
This commit is contained in:
commit
d14e52b47a
@ -278,6 +278,10 @@ pub(super) fn find_opaque_ty_constraints_for_rpit<'tcx>(
|
||||
|
||||
let mir_opaque_ty = tcx.mir_borrowck(owner_def_id).concrete_opaque_types.get(&def_id).copied();
|
||||
if let Some(mir_opaque_ty) = mir_opaque_ty {
|
||||
if mir_opaque_ty.references_error() {
|
||||
return mir_opaque_ty.ty;
|
||||
}
|
||||
|
||||
let scope = tcx.local_def_id_to_hir_id(owner_def_id);
|
||||
debug!(?scope);
|
||||
let mut locator = RpitConstraintChecker { def_id, tcx, found: mir_opaque_ty };
|
||||
|
10
tests/ui/traits/issue-117794.rs
Normal file
10
tests/ui/traits/issue-117794.rs
Normal file
@ -0,0 +1,10 @@
|
||||
trait Foo {}
|
||||
|
||||
trait T {
|
||||
fn a(&self) -> impl Foo {
|
||||
self.b(|| 0)
|
||||
//~^ ERROR no method named `b` found for reference `&Self` in the current scope
|
||||
}
|
||||
}
|
||||
|
||||
fn main() {}
|
9
tests/ui/traits/issue-117794.stderr
Normal file
9
tests/ui/traits/issue-117794.stderr
Normal file
@ -0,0 +1,9 @@
|
||||
error[E0599]: no method named `b` found for reference `&Self` in the current scope
|
||||
--> $DIR/issue-117794.rs:5:14
|
||||
|
|
||||
LL | self.b(|| 0)
|
||||
| ^ help: there is a method with a similar name: `a`
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0599`.
|
Loading…
Reference in New Issue
Block a user