Rollup merge of #119975 - lukas-code:inferring-return-types-and-opaque-types-do-mix-sometimes, r=compiler-errors
Don't ICE if TAIT-defining fn contains a closure with `_` in return type
The `delay_span_bug` got added in 0e82aaeb67
to reduce the amount of errors emitted for functions that have `_` in their return type, because inference doesn't apply to function items. But this logic shouldn't apply to closures, because their return types *can* be inferred.
Fixes https://github.com/rust-lang/rust/issues/119916.
This commit is contained in:
commit
22f19130df
@ -135,18 +135,25 @@ impl TaitConstraintLocator<'_> {
|
||||
return;
|
||||
}
|
||||
|
||||
if let Some(hir_sig) = self.tcx.hir_node_by_def_id(item_def_id).fn_decl() {
|
||||
if hir_sig.output.get_infer_ret_ty().is_some() {
|
||||
let guar = self.tcx.dcx().span_delayed_bug(
|
||||
hir_sig.output.span(),
|
||||
"inferring return types and opaque types do not mix well",
|
||||
);
|
||||
self.found = Some(ty::OpaqueHiddenType {
|
||||
span: DUMMY_SP,
|
||||
ty: Ty::new_error(self.tcx, guar),
|
||||
});
|
||||
return;
|
||||
}
|
||||
// Function items with `_` in their return type already emit an error, skip any
|
||||
// "non-defining use" errors for them.
|
||||
// Note that we use `Node::fn_sig` instead of `Node::fn_decl` here, because the former
|
||||
// excludes closures, which are allowed to have `_` in their return type.
|
||||
let hir_node = self.tcx.hir_node_by_def_id(item_def_id);
|
||||
debug_assert!(
|
||||
!matches!(hir_node, Node::ForeignItem(..)),
|
||||
"foreign items cannot constrain opaque types",
|
||||
);
|
||||
if let Some(hir_sig) = hir_node.fn_sig()
|
||||
&& hir_sig.decl.output.get_infer_ret_ty().is_some()
|
||||
{
|
||||
let guar = self.tcx.dcx().span_delayed_bug(
|
||||
hir_sig.decl.output.span(),
|
||||
"inferring return types and opaque types do not mix well",
|
||||
);
|
||||
self.found =
|
||||
Some(ty::OpaqueHiddenType { span: DUMMY_SP, ty: Ty::new_error(self.tcx, guar) });
|
||||
return;
|
||||
}
|
||||
|
||||
// Calling `mir_borrowck` can lead to cycle errors through
|
||||
|
35
tests/ui/type-alias-impl-trait/closure_infer.rs
Normal file
35
tests/ui/type-alias-impl-trait/closure_infer.rs
Normal file
@ -0,0 +1,35 @@
|
||||
// check-pass
|
||||
|
||||
// Regression test for an ICE: https://github.com/rust-lang/rust/issues/119916
|
||||
|
||||
#![feature(impl_trait_in_assoc_type)]
|
||||
#![feature(type_alias_impl_trait)]
|
||||
|
||||
// `impl_trait_in_assoc_type` example from the bug report.
|
||||
pub trait StreamConsumer {
|
||||
type BarrierStream;
|
||||
fn execute() -> Self::BarrierStream;
|
||||
}
|
||||
|
||||
pub struct DispatchExecutor;
|
||||
|
||||
impl StreamConsumer for DispatchExecutor {
|
||||
type BarrierStream = impl Sized;
|
||||
fn execute() -> Self::BarrierStream {
|
||||
|| -> _ {}
|
||||
}
|
||||
}
|
||||
|
||||
// Functions that constrain TAITs can contain closures with an `_` in the return type.
|
||||
type Foo = impl Sized;
|
||||
fn foo() -> Foo {
|
||||
|| -> _ {}
|
||||
}
|
||||
|
||||
// The `_` in the closure return type can also be the TAIT itself.
|
||||
type Bar = impl Sized;
|
||||
fn bar() -> impl FnOnce() -> Bar {
|
||||
|| -> _ {}
|
||||
}
|
||||
|
||||
fn main() {}
|
@ -12,3 +12,8 @@ fn test() -> Pointer<_> {
|
||||
fn main() {
|
||||
test();
|
||||
}
|
||||
|
||||
extern "Rust" {
|
||||
fn bar() -> Pointer<_>;
|
||||
//~^ ERROR: the placeholder `_` is not allowed within types
|
||||
}
|
||||
|
@ -7,6 +7,15 @@ LL | fn test() -> Pointer<_> {
|
||||
| | not allowed in type signatures
|
||||
| help: replace with the correct return type: `Pointer<i32>`
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
error[E0121]: the placeholder `_` is not allowed within types on item signatures for functions
|
||||
--> $DIR/issue-77179.rs:17:25
|
||||
|
|
||||
LL | fn bar() -> Pointer<_>;
|
||||
| ^
|
||||
| |
|
||||
| not allowed in type signatures
|
||||
| help: use type parameters instead: `T`
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0121`.
|
||||
|
Loading…
x
Reference in New Issue
Block a user