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

avoid catching InterpError #70375

Merged
merged 1 commit into from
Mar 26, 2020
Merged

Conversation

RalfJung
Copy link
Member

Avoid raising and then capturing InterpError for the definedness check.

Cc #69297
r? @oli-obk

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

oli-obk commented Mar 25, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2020

📌 Commit 7ddd61b 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 Mar 25, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 25, 2020
avoid catching InterpError

Avoid raising and then capturing `InterpError` for the definedness check.

Cc rust-lang#69297
r? @oli-obk
This was referenced Mar 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#70226 (use checked casts and arithmetic in Miri engine)
 - rust-lang#70319 (correctly normalize constants)
 - rust-lang#70352 (Add long error explanation for E0710 )
 - rust-lang#70366 (Implement Fuse with Option)
 - rust-lang#70379 (fix incorrect type name in doc comments)

Failed merges:

 - rust-lang#70375 (avoid catching InterpError)

r? @ghost
@Centril
Copy link
Contributor

Centril commented Mar 25, 2020

Has a merge conflict, @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 Mar 25, 2020
@Dylan-DPC-zz
Copy link

@bors r- (failed merge in rollup)

@RalfJung
Copy link
Member Author

But why did bors not post the usual message here that there is a merge conflict?

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#69700 (Rename LayoutDetails to just Layout.)
 - rust-lang#70392 (Make x.py compatible with python 3.8.)
 - rust-lang#70406 (Clean up E0458 explanation)
 - rust-lang#70407 (Avoid tagging as I-nominated on toolstate breakage)
 - rust-lang#70409 (gitignore: allow target to be a symlink)

Failed merges:

 - rust-lang#70375 (avoid catching InterpError)

r? @ghost
@Centril
Copy link
Contributor

Centril commented Mar 25, 2020

@RalfJung bors be buggy beautiful and kind, please don't incinerate me.

@bors
Copy link
Contributor

bors commented Mar 25, 2020

☔ The latest upstream changes (presumably #70404) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member Author

Ah no it's just slow. ;)

@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Mar 25, 2020

📌 Commit 0fdb7df 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 Mar 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2020
Rollup of 6 pull requests

Successful merges:

 - rust-lang#69866 (Rename `def_span` to `guess_head_span`)
 - rust-lang#69878 (Tweak chained operators diagnostic)
 - rust-lang#70375 (avoid catching InterpError)
 - rust-lang#70386 (typeck: minor pattern typing improvements)
 - rust-lang#70389 (borrowck: prefer "value" over "`_`" in diagnostics)
 - rust-lang#70395 (Update cargo.)

Failed merges:

r? @ghost
@bors bors merged commit ef01fe6 into rust-lang:master Mar 26, 2020
@RalfJung RalfJung mentioned this pull request Mar 26, 2020
2 tasks
@RalfJung RalfJung deleted the check-defined-err branch March 26, 2020 07:37
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.

6 participants