Skip to content

Commit

Permalink
Rollup merge of rust-lang#88147 - FabianWolff:issue-88097, r=jackh726
Browse files Browse the repository at this point in the history
Fix non-capturing closure return type coercion

Fixes rust-lang#88097. For the example given there:
```rust
fn peculiar() -> impl Fn(u8) -> u8 {
    return |x| x + 1
}
```
which incorrectly reports an error, I noticed something weird in the debug log:
```
DEBUG rustc_typeck::check::coercion coercion::try_find_coercion_lub([closure@test.rs:2:12: 2:21], [closure@test.rs:2:12: 2:21], exprs=1 exprs)
```
Apparently, `try_find_coercion_lub()` thinks that the LUB for two closure types always has to be a function pointer (which explains the `expected closure, found fn pointer` error in rust-lang#88097). There is one corner case where that isn't true, though — namely, when the two closure types are equal, in which case the trivial LUB is the type itself. This PR fixes this by inserting an explicit check for type equality in `try_find_coercion_lub()`.
  • Loading branch information
GuillaumeGomez authored Sep 11, 2021
2 parents fd389b5 + bbe3be9 commit 1cf99f5
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
6 changes: 6 additions & 0 deletions compiler/rustc_typeck/src/check/coercion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
exprs.len()
);

// The following check fixes #88097, where the compiler erroneously
// attempted to coerce a closure type to itself via a function pointer.
if prev_ty == new_ty {
return Ok(prev_ty);
}

// Special-case that coercion alone cannot handle:
// Function items or non-capturing closures of differing IDs or InternalSubsts.
let (a_sig, b_sig) = {
Expand Down
31 changes: 31 additions & 0 deletions src/test/ui/coercion/issue-88097.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// In #88097, the compiler attempted to coerce a closure type to itself via
// a function pointer, which caused an unnecessary error. Check that this
// behavior has been fixed.

// check-pass

fn peculiar() -> impl Fn(u8) -> u8 {
return |x| x + 1
}

fn peculiar2() -> impl Fn(u8) -> u8 {
return |x| x + 1;
}

fn peculiar3() -> impl Fn(u8) -> u8 {
let f = |x| x + 1;
return f
}

fn peculiar4() -> impl Fn(u8) -> u8 {
let f = |x| x + 1;
f
}

fn peculiar5() -> impl Fn(u8) -> u8 {
let f = |x| x + 1;
let g = |x| x + 2;
return if true { f } else { g }
}

fn main() {}

0 comments on commit 1cf99f5

Please sign in to comment.