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

Add label for generic arg (+ APIT) and RPIT callables in label_fn_like #99131

Merged
merged 2 commits into from
Jul 15, 2022
Merged

Add label for generic arg (+ APIT) and RPIT callables in label_fn_like #99131

merged 2 commits into from
Jul 15, 2022

Conversation

compiler-errors
Copy link
Member

Fixes #98308

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 10, 2022
@rust-highfive
Copy link
Collaborator

r? @cjgillot

(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 Jul 10, 2022
@compiler-errors compiler-errors changed the title Add support for APIT and RPIT callables in label_fn_like Add label for generic arg (+ APIT) and RPIT callables in label_fn_like Jul 10, 2022
cjgillot
cjgillot reviewed Jul 11, 2022
View reviewed changes
Copy link
Contributor

@cjgillot cjgillot left a comment

Choose a reason for hiding this comment

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

Thanks @compiler-errors. This looks good. I left a few questions.

compiler/rustc_typeck/src/check/fn_ctxt/checks.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/fn_ctxt/checks.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/fn_ctxt/checks.rs Show resolved Hide resolved
src/test/ui/mismatched_types/overloaded-calls-bad.stderr
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
LL | extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output;
| ^^^^^^^^
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we print something here? Point to where the impl for s comes from?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's a bit of work to do so, but done!

compiler/rustc_typeck/src/check/fn_ctxt/checks.rs Show resolved Hide resolved
@cjgillot cjgillot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2022
@compiler-errors
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 13, 2022
cjgillot
cjgillot approved these changes Jul 13, 2022
View reviewed changes
Copy link
Contributor

@cjgillot cjgillot left a comment

Choose a reason for hiding this comment

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

r=me with an extra comment.

compiler/rustc_typeck/src/check/fn_ctxt/checks.rs Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Jul 14, 2022

☔ The latest upstream changes (presumably #99231) made this pull request unmergeable. Please resolve the merge conflicts.

@compiler-errors
Copy link
Member Author

@bors r=cjgillot

@bors
Copy link
Contributor

bors commented Jul 14, 2022

📌 Commit d25abdc has been approved by cjgillot

It is now in the queue for this repository.

@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 Jul 14, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Jul 15, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 15, 2022
@bors
Auto merge of rust-lang#99267 - Dylan-DPC:rollup-d8l7y1o, r=Dylan-DPC
522abf6 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#99113 (Simplify [a]rc code a little)
 - rust-lang#99131 (Add label for generic arg (+ APIT) and RPIT callables in `label_fn_like`)
 - rust-lang#99237 (removed unused CSS and unused HTML IDs)
 - rust-lang#99239 (Add myself to the set of people notified when MIR changes.)
 - rust-lang#99241 (Remove comment referring to constness.rs)
 - rust-lang#99257 (Add regression test for rust-lang#89436)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7b63058 into rust-lang:master Jul 15, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 15, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 15, 2022

This is amazing, thank you so much!!

@WaffleLapkin WaffleLapkin mentioned this pull request Nov 22, 2022
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request Nov 22, 2022
@Manishearth
Rollup merge of rust-lang#104724 - WaffleLapkin:to_def_idn't, r=compi…
2078dbd 
…ler-errors

Fix `ClosureKind::to_def_id`

`Fn` and `FnOnce` were mixed up in rust-lang#99131.
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Nov 22, 2022
Rollup merge of rust-lang#104724 - WaffleLapkin:to_def_idn't, r=compi…
dcbfb97 
…ler-errors

Fix `ClosureKind::to_def_id`

`Fn` and `FnOnce` were mixed up in rust-lang#99131.
Manishearth added a commit to Manishearth/rust that referenced this pull request Nov 22, 2022
@Manishearth
Rollup merge of rust-lang#104724 - WaffleLapkin:to_def_idn't, r=compi…
1e65fcc 
…ler-errors

Fix `ClosureKind::to_def_id`

`Fn` and `FnOnce` were mixed up in rust-lang#99131.
@compiler-errors compiler-errors deleted the label-fn branch August 11, 2023 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot approved these changes

Assignees

@cjgillot cjgillot

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.

Don't point to Fn::call when the arguments passed to a closure are incorrect
6 participants
@compiler-errors @rust-highfive @bors @jyn514 @cjgillot @rustbot