add reusable MachineStop variant to Miri engine error enum#66926
Merged
bors merged 1 commit intorust-lang:masterfrom Dec 2, 2019
Merged
add reusable MachineStop variant to Miri engine error enum#66926bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
rust-highfive
added
the
S-waiting-on-review
oli-obk
reviewed
Dec 1, 2019
| Exit(i32), | ||
| /// Stop execution for a machine-controlled reason. This is never raised by | ||
| /// the core engine itself. | ||
| MachineStop(Box<dyn Any + Send>), |
Contributor
There was a problem hiding this comment.
I once tried out making this a generic parameter, that did not go so well (or at least infected everything)
Member
Author
There was a problem hiding this comment.
Yeah I figured that would be quite a mess, hence the dynamically typed approach.
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 4b81dd4 has been approved by |
Collaborator
|
🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Dec 2, 2019
add reusable MachineStop variant to Miri engine error enum Replace the Miri-tool-specific `Exit` error variant with something dynamically typed that all clients of the Miri engine can use. r? @oli-obk Cc rust-lang#66902
bors
added a commit
that referenced
this pull request
Dec 2, 2019
Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66905 (rustc_plugin: Remove some remaining plugin features) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) - #66918 (Add crc and crypto to target feature whitelist on arm) - #66926 (add reusable MachineStop variant to Miri engine error enum) 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
4 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.
Replace the Miri-tool-specific
Exiterror variant with something dynamically typed that all clients of the Miri engine can use.r? @oli-obk
Cc #66902