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.

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

validation: fix invalid-fn-ptr error message #82175

Merged
merged 2 commits into from
Feb 16, 2021

Conversation

RalfJung
Copy link
Member

#82061 changed the code here to print an ImmTy instead of a ScalarMaybeUninit; that was an accident. So go back to printing a ScalarMaybeUninit.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 16, 2021
@oli-obk
Copy link
Contributor

oli-obk commented Feb 16, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 16, 2021

📌 Commit e5514ef 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 Feb 16, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 16, 2021
validation: fix invalid-fn-ptr error message

rust-lang#82061 changed the code here to print an `ImmTy` instead of a `ScalarMaybeUninit`; that was an accident. So go back to printing a `ScalarMaybeUninit`.

r? `@oli-obk`
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 16, 2021
validation: fix invalid-fn-ptr error message

rust-lang#82061 changed the code here to print an `ImmTy` instead of a `ScalarMaybeUninit`; that was an accident. So go back to printing a `ScalarMaybeUninit`.

r? ``@oli-obk``
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2021
…laumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#82145 (Fix ES5 errors (IE11))
 - rust-lang#82160 (Fix typo in rustc_infer::infer::UndoLog)
 - rust-lang#82161 (Add long explanation for E0545)
 - rust-lang#82163 (avoid full-slicing slices)
 - rust-lang#82175 (validation: fix invalid-fn-ptr error message)
 - rust-lang#82184 ([Minor] Update discriminant_value docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 866dc5a into rust-lang:master Feb 16, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 16, 2021
@RalfJung RalfJung deleted the invalid-fn-ptr branch February 18, 2021 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants