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

add error_occured field to ConstQualifs, #78809

Merged
merged 5 commits into from
Nov 14, 2020
Merged

Conversation

vn-ki
Copy link
Contributor

@vn-ki vn-ki commented Nov 6, 2020

fix #76064

I wasn't sure what in_return_place actually did and not sure why it returns ConstQualifs while it's sibling functions return bool. So I tried to make as minimal changes to the structure as possible. Please point out whether I have to refactor it or not.

r? @oli-obk
cc @RalfJung

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2020
@@ -0,0 +1,3 @@
struct Bug([u8; panic!(1)]); //~ ERROR panicking in constants is unstable
Copy link
Contributor Author

@vn-ki vn-ki Nov 6, 2020

Choose a reason for hiding this comment

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

Not sure what a good test case is, in this case. So I added the one from the issue.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is a good test case. This PR does not yet fix struct Bug([u8; {let x; x}]);, so there are no other tests to add

@oli-obk
Copy link
Contributor

oli-obk commented Nov 10, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Nov 10, 2020

📌 Commit 0c56372 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 Nov 10, 2020
@jonas-schievink
Copy link
Contributor

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 11, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Nov 12, 2020

You need to rebase and re-bless, looks like we got another test added in the mean time

@vn-ki
Copy link
Contributor Author

vn-ki commented Nov 12, 2020

Looks like the the new test still haven't been merged?

@oli-obk
Copy link
Contributor

oli-obk commented Nov 13, 2020

Ah... this is a test from another PR?

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Nov 13, 2020

📌 Commit 0c56372 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 13, 2020
@vn-ki
Copy link
Contributor Author

vn-ki commented Nov 13, 2020

Is it not?

failures:
    [ui] ui/crashes/ice-6252.rs

I could not find that file in the repo.

@vn-ki
Copy link
Contributor Author

vn-ki commented Nov 13, 2020

Oh, my bad. I was looking in the wrong place. It was inside the clippy tests. I didn't look inside there.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 13, 2020

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 13, 2020
@vn-ki
Copy link
Contributor Author

vn-ki commented Nov 14, 2020

@oli-obk I've fixed the test.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 14, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Nov 14, 2020

📌 Commit f026d0f 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 14, 2020
@bors
Copy link
Contributor

bors commented Nov 14, 2020

⌛ Testing commit f026d0f with merge a439b5b1ca6ec3543584169639e0ccdc7f278b8b...

@bors
Copy link
Contributor

bors commented Nov 14, 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 Nov 14, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Nov 14, 2020

@bors retry #78665

@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 Nov 14, 2020
@bors
Copy link
Contributor

bors commented Nov 14, 2020

⌛ Testing commit f026d0f with merge 98d6634...

@bors
Copy link
Contributor

bors commented Nov 14, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2020
@bors bors merged commit 98d6634 into rust-lang:master Nov 14, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 14, 2020
flip1995 pushed a commit to flip1995/rust that referenced this pull request Nov 20, 2020
add error_occured field to ConstQualifs,

fix rust-lang#76064

I wasn't sure what `in_return_place` actually did and not sure why it returns `ConstQualifs` while it's sibling functions return `bool`. So I tried to make as minimal changes to the structure as possible. Please point out whether I have to refactor it or not.

r? `@oli-obk`
cc `@RalfJung`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Invalid (unstable, ill-formed, ...) const code is evaluated even after emitting error
6 participants