Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve infered types when complaining about unexpected call type #89202

Merged
merged 2 commits into from
Oct 1, 2021
Merged

Resolve infered types when complaining about unexpected call type #89202

merged 2 commits into from
Oct 1, 2021

Conversation

estebank
Copy link
Contributor 

error[E0618]: expected function, found `{integer}`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function

instead of

error[E0618]: expected function, found `_`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function

@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 23, 2021
oli-obk
oli-obk reviewed Sep 25, 2021
View reviewed changes
compiler/rustc_typeck/src/check/callee.rs
@@ -350,6 +350,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
}

let callee_ty = self.resolve_vars_if_possible(callee_ty);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why callee_ty is an TyVar and not an IntVar, I think we should dig into this a bit instead of just patching up the diagnostic

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing the TyVar is coming from the {} block's tail expression not having unified yet?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that were the case, wouldn't we also see the tyvar, when using a function type?

I think we're doing something odd when type checking the literal expression.

I'm currently somewhere deep in that code anyway, I'll check and post my findings

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, you're right. The tail block expression will fall back to a type variable in case we don't know anything about the type. This happens in

rust/compiler/rustc_typeck/src/check/expectation.rs

Line 119 in 3982ac2

fcx.next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span })

So... I guess we can't avoid this at creation time. oh well...

@oli-obk
Copy link
Contributor

oli-obk commented Sep 25, 2021

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned wesleywiser Sep 25, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Sep 30, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 30, 2021

📌 Commit 072d107 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 30, 2021
ehuss added a commit to ehuss/rust that referenced this pull request Sep 30, 2021
@ehuss
Rollup merge of rust-lang#89202 - estebank:infer-call-type, r=oli-obk
f4b35de 
Resolve infered types when complaining about unexpected call type

```
error[E0618]: expected function, found `{integer}`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function
```
instead of
```
error[E0618]: expected function, found `_`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function
```
@ehuss ehuss mentioned this pull request Sep 30, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 30, 2021
@Manishearth
Rollup merge of rust-lang#89202 - estebank:infer-call-type, r=oli-obk
ff7b1c2 
Resolve infered types when complaining about unexpected call type

```
error[E0618]: expected function, found `{integer}`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function
```
instead of
```
error[E0618]: expected function, found `_`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function
```
@Manishearth Manishearth mentioned this pull request Sep 30, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 30, 2021
@Manishearth
Rollup merge of rust-lang#89202 - estebank:infer-call-type, r=oli-obk
bee3ae3 
Resolve infered types when complaining about unexpected call type

```
error[E0618]: expected function, found `{integer}`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function
```
instead of
```
error[E0618]: expected function, found `_`
  --> $DIR/call-block.rs:2:13
   |
LL |     let _ = {42}();
   |             ^^^^--
   |             |
   |             call expression requires function
```
@Manishearth Manishearth mentioned this pull request Sep 30, 2021
Closed
@Manishearth Manishearth mentioned this pull request Oct 1, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 1, 2021
@bors
Auto merge of rust-lang#89414 - Manishearth:rollup-hs11bcq, r=Manishe…
598d89b 
…arth

Rollup of 8 pull requests

Successful merges:

 - rust-lang#88782 (Fix ICE when `start` lang item has wrong generics)
 - rust-lang#89202 (Resolve infered types when complaining about unexpected call type )
 - rust-lang#89248 (Suggest similarly named associated items in trait impls)
 - rust-lang#89303 (Add `#[must_not_suspend]` to some types in std)
 - rust-lang#89306 (thread: implements available_concurrency on haiku)
 - rust-lang#89314 (fix(lint): don't suggest refutable patterns to "fix" irrefutable bind)
 - rust-lang#89370 (CTFE: tweak aggregate rvalue handling)
 - rust-lang#89392 (bootstrap: Update comment in config.library.toml.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b437be4 into rust-lang:master Oct 1, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 1, 2021
@estebank estebank deleted the infer-call-type branch November 9, 2023 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.
6 participants
@estebank @rust-highfive @oli-obk @bors @wesleywiser @rustbot