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

update Miri #64485

Merged
merged 3 commits into from
Sep 17, 2019
Merged

update Miri #64485

merged 3 commits into from
Sep 17, 2019

Conversation

RalfJung
Copy link
Member

Fixes #64363

r? @alexcrichton for the Cargo.toml changes: with byteorder 1.3, the i128 feature is a NOP, so we can remove it everywhere and then get rid of this crate in the workspace-hack.

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 15, 2019
@rust-highfive

This comment has been minimized.

@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Sep 16, 2019

📌 Commit d77e51dcfafa990e1bb50523f079af124f14ea2f has been approved by alexcrichton

@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 Sep 16, 2019
@bors

This comment has been minimized.

@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 Sep 16, 2019
@RalfJung
Copy link
Member Author

Resolved conflicts.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Sep 16, 2019

📌 Commit b7ebbc2 has been approved by alexcrichton

@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 Sep 16, 2019
@bors
Copy link
Contributor

bors commented Sep 16, 2019

⌛ Testing commit b7ebbc2 with merge b279b2ea3f2dee299a87613c8839b964d2c21920...

Centril added a commit to Centril/rust that referenced this pull request Sep 16, 2019
update Miri

Fixes rust-lang#64363

r? @alexcrichton for the Cargo.toml changes: with byteorder 1.3, the `i128` feature is a NOP, so we can remove it everywhere and then get rid of this crate in the workspace-hack.
@Centril
Copy link
Contributor

Centril commented Sep 16, 2019

@bors retry rolled up.

@bors
Copy link
Contributor

bors commented Sep 16, 2019

⌛ Testing commit b7ebbc2 with merge 19d38d7d69ad79c5dac43437a7e83c556b200593...

Centril added a commit to Centril/rust that referenced this pull request Sep 16, 2019
update Miri

Fixes rust-lang#64363

r? @alexcrichton for the Cargo.toml changes: with byteorder 1.3, the `i128` feature is a NOP, so we can remove it everywhere and then get rid of this crate in the workspace-hack.
@Centril
Copy link
Contributor

Centril commented Sep 16, 2019

@bors retry rolled up.

bors added a commit that referenced this pull request Sep 16, 2019
Rollup of 4 pull requests

Successful merges:

 - #64357 (`AdtDef` is an algebraic data type, not abstract data type)
 - #64485 (update Miri)
 - #64509 (Make some adjustments to the documentation for `std::convert::identity`)
 - #64518 (Use while let slice_pattern instead of carrying an index around)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 17, 2019

⌛ Testing commit b7ebbc2 with merge 7ac21e7...

@bors bors merged commit b7ebbc2 into rust-lang:master Sep 17, 2019
@RalfJung RalfJung deleted the miri branch September 17, 2019 07:28
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.

miri no longer builds after rust-lang/rust#64354
5 participants