Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:invalid-fn-ptr
Feb 16, 2021
Merged

validation: fix invalid-fn-ptr error message#82175
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:invalid-fn-ptr

Conversation

@RalfJung

Copy link
Copy Markdown
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-highfiverust-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
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Feb 16, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit e5514ef has been approved by oli-obk

@borsbors 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:masterFeb 16, 2021
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@RalfJung@oli-obk@bors@rust-highfive@rustbot