Incorrect error message about enum variant when trying to call a Result

[comex]

Test case (playground link):

fn foo() -> Result<i32, i32> {
    Ok(42)
}

fn main() {
    foo()();
}

The real issue is an extra set of parentheses after foo(), which should produce an error because Result<i32, i32> is not a function. However, rustc (stable and current nightly) produces this error message:

error[E0618]: expected function, found enum variant `foo()`
 --> src/main.rs:6:5
  |
6 |     foo()();
  |     ^^^^^^^ not a function
help: `foo()` is a unit variant, you need to write it without the parenthesis
  |
6 |     foo();
  |     ^^^^^

• The first line is confusing and semi-incorrect: although foo() does evaluate to a value of enum type, it's not a specific variant, and "found enum variant foo()" makes it seem like foo itself is an enum.
• The line after help: is incorrect: neither of the variants of the Result enum is a unit variant.
• The suggested fix is correct, which is nice :)

[steveklabnik]

Triage: no change

[estebank]

Current output:

error[E0618]: expected function, found enum variant `foo()`
 --> src/main.rs:6:5
  |
1 | / fn foo() -> Result<i32, i32> {
2 | |     Ok(42)
3 | | }
  | |_- `foo()` defined here
...
6 |       foo()();
  |       ^^^^^--
  |       |
  |       call expression requires function
help: `foo()` is a unit variant, you need to write it without the parenthesis
  |
6 |     foo();
  |     ^^^^^

[estebank]

Current output:

error[E0618]: expected function, found `Result<i32, i32>`
 --> src/main.rs:6:5
  |
1 | fn foo() -> Result<i32, i32> {
  | ---------------------------- `foo` defined here returns `Result<i32, i32>`
...
6 |     foo()();
  |     ^^^^^--
  |     |
  |     call expression requires function

It seems like the only outstanding thing here would be to recover the previous suggestion with correct wording, but other than that I am happy with the current output.