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

Ensure miri can do bit ops on pointer values #63839

Merged
merged 1 commit into from Aug 25, 2019

Conversation

@oli-obk
Copy link
Contributor

commented Aug 24, 2019

@RalfJung

This comment has been minimized.

Copy link
Member

commented Aug 24, 2019

Thanks!

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 24, 2019

📌 Commit 7dff647 has been approved by RalfJung

Centril added a commit to Centril/rust that referenced this pull request Aug 24, 2019
Rollup merge of rust-lang#63839 - oli-obk:intptrcast, r=RalfJung
Ensure miri can do bit ops on pointer values

r? @RalfJung

Fixes rust-lang/miri#916
Centril added a commit to Centril/rust that referenced this pull request Aug 24, 2019
Rollup merge of rust-lang#63839 - oli-obk:intptrcast, r=RalfJung
Ensure miri can do bit ops on pointer values

r? @RalfJung

Fixes rust-lang/miri#916
bors added a commit that referenced this pull request Aug 24, 2019
Auto merge of #63864 - Centril:rollup-7f5jqwp, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #62855 (Improve Rustdoc's handling of procedural macros)
 - #63813 (Do not suggest `.try_into()` on `i32::from(x)`)
 - #63839 (Ensure miri can do bit ops on pointer values)
 - #63854 (Modifies how Arg, Arm, Field, FieldPattern and Variant are visited)
 - #63859 (Don't unwrap the result of `span_to_snippet`)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Aug 25, 2019
Rollup merge of rust-lang#63839 - oli-obk:intptrcast, r=RalfJung
Ensure miri can do bit ops on pointer values

r? @RalfJung

Fixes rust-lang/miri#916
bors added a commit that referenced this pull request Aug 25, 2019
Auto merge of #63873 - Centril:rollup-jgglypd, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #62744 (Refactor `TinyList::contains` and `len` to iterate instead of recurse)
 - #63813 (Do not suggest `.try_into()` on `i32::from(x)`)
 - #63833 (Suggest calling closure with resolved return type when appropriate)
 - #63839 (Ensure miri can do bit ops on pointer values)
 - #63854 (Modifies how Arg, Arm, Field, FieldPattern and Variant are visited)
 - #63859 (Don't unwrap the result of `span_to_snippet`)

Failed merges:

r? @ghost

@bors bors merged commit 7dff647 into rust-lang:master Aug 25, 2019

4 checks passed

pr Build #20190824.1 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 25, 2019

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

@abonander abonander referenced this pull request Aug 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.