Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 7ddd61b has been approved by |
bors
added
S-waiting-on-bors
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
Contributor
|
Has a merge conflict, @bors r- |
bors
added
S-waiting-on-author
|
@bors r- (failed merge in rollup) |
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
Contributor
|
@RalfJung bors be |
Collaborator
|
☔ The latest upstream changes (presumably #70404) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
Author
|
Ah no it's just slow. ;) |
RalfJung
force-pushed
the
check-defined-err
branch
from
7ddd61b to
0fdb7df
Compare
Member
Author
|
@bors r=oli-obk |
Collaborator
|
📌 Commit 0fdb7df has been approved by |
bors
added
S-waiting-on-bors
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Avoid raising and then capturing
InterpErrorfor the definedness check.Cc #69297
r? @oli-obk