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

CTFE: tweak abort-on-uninhabited message #79910

Merged
merged 2 commits into from
Dec 11, 2020
Merged

CTFE: tweak abort-on-uninhabited message #79910

merged 2 commits into from
Dec 11, 2020

Conversation

RalfJung
Copy link
Member

Having an "aborted execution:" makes it more consistent with the Abort terminator saying "the program aborted execution". Right now, at least one of the two errors will look weird in Miri.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2020
@RalfJung RalfJung mentioned this pull request Dec 10, 2020
Merged
@jyn514 jyn514 added A-const-eval Area: Constant evaluation (MIR interpretation) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 10, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Dec 11, 2020

What do you think about making the Abort error variant prefix abroted execution: to the message and replacing the abort intrinsics's message with something like "explicit abort invocation" or similar? (I don't want to talk about the intrinsic in the abort intrinsic's message, because that is nothing the user really knows about)

@RalfJung
Copy link
Member Author

IIRC, "the program aborted execution" is what real abort will print outside Miri, so I wanted Miri to mirror that.

@oli-obk
Copy link
Contributor

oli-obk commented Dec 11, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Dec 11, 2020

📌 Commit d8ee8e7 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 Dec 11, 2020
@bors
Copy link
Contributor

bors commented Dec 11, 2020

⌛ Testing commit d8ee8e7 with merge ade81e1efa94e3cf65e38f42af3be556bb5b7aca...

@bors
Copy link
Contributor

bors commented Dec 11, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 11, 2020
@RalfJung
Copy link
Member Author

curl: (6) Could not resolve host: ci-mirrors.rust-lang.org

@bors retry

@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 Dec 11, 2020
@bors
Copy link
Contributor

bors commented Dec 11, 2020

⌛ Testing commit d8ee8e7 with merge a9f7d19...

@bors
Copy link
Contributor

bors commented Dec 11, 2020

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing a9f7d19 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 11, 2020
@bors bors merged commit a9f7d19 into rust-lang:master Dec 11, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 11, 2020
@RalfJung RalfJung deleted the abort-msg branch December 13, 2020 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
A-const-eval Area: Constant evaluation (MIR interpretation) merged-by-bors This PR was explicitly merged by bors. 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.50.0
Development

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