Skip to content

CTFE: tweak abort-on-uninhabited message - #79910

Merged
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:abort-msg
Dec 11, 2020
Merged

CTFE: tweak abort-on-uninhabited message#79910
bors merged 2 commits into
rust-lang:masterfrom
RalfJung:abort-msg

Conversation

@RalfJung

@RalfJungRalfJung commented Dec 10, 2020

Copy link
Copy Markdown
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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2020
@RalfJungRalfJung mentioned this pull request Dec 10, 2020
Merged
@jyn514jyn514 added A-const-eval Area: Constant evaluation, covers all const contexts (static, const fn, ...) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 10, 2020
@oli-obk

oli-obk commented Dec 11, 2020

Copy link
Copy Markdown
Contributor

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

RalfJung commented Dec 11, 2020

Copy link
Copy Markdown
MemberAuthor

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

@oli-obk

oli-obk commented Dec 11, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Dec 11, 2020

Copy link
Copy Markdown
Collaborator

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

bors commented Dec 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d8ee8e7 with merge ade81e1efa94e3cf65e38f42af3be556bb5b7aca...

@bors

bors commented Dec 11, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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

RalfJung commented Dec 11, 2020

Copy link
Copy Markdown
MemberAuthor

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

@bors retry

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

bors commented Dec 11, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d8ee8e7 with merge a9f7d19...

@bors

bors commented Dec 11, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 11, 2020
@bors
bors merged commit a9f7d19 into rust-lang:masterDec 11, 2020
@rustbotrustbot 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obkoli-obk

Labels

A-const-evalArea: Constant evaluation, covers all const contexts (static, const fn, ...)merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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