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.

Sign up for GitHub

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

Jump to bottom

update miri #61832

Merged
merged 1 commit into from
Jun 16, 2019
Merged

update miri #61832

merged 1 commit into from
Jun 16, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 14, 2019 •
edited
Loading

Fixes #61830
Fixes #61848

r? @oli-obk

@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 Jun 14, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jun 14, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 14, 2019

📌 Commit 7412e7004ac28cb086eebd2e3bc26407b0955ffb 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 Jun 14, 2019
@RalfJung
Copy link
Member Author

Miri got broken again.

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

RalfJung commented Jun 14, 2019 •
edited
Loading

I updated this to an unmerged branch because due to #61828, Miri's CI is currently broken.

Let's see if Travis is happy here before r+'ing.

@RalfJung
Copy link
Member Author

That's looking very green.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jun 15, 2019

📌 Commit d54b27d 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 Jun 15, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 16, 2019
@Centril
Rollup merge of rust-lang#61832 - RalfJung:miri, r=oli-obk
59714d7 
update miri

Fixes rust-lang#61830
Fixes rust-lang#61848

r? @oli-obk
@Centril Centril mentioned this pull request Jun 16, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jun 16, 2019
@Centril
Rollup merge of rust-lang#61832 - RalfJung:miri, r=oli-obk
af56111 
update miri

Fixes rust-lang#61830
Fixes rust-lang#61848

r? @oli-obk
@Centril Centril mentioned this pull request Jun 16, 2019
Merged
bors added a commit that referenced this pull request Jun 16, 2019
@bors
Auto merge of #61886 - Centril:rollup-3p3m2fu, r=Centril
374c63e 
Rollup of 6 pull requests

Successful merges:

 - #61447 (Add some Vec <-> VecDeque documentation)
 - #61704 (Pass LLVM linker flags to librustc_llvm build)
 - #61829 (rustbuild: include llvm-libunwind in dist tarball)
 - #61832 (update miri)
 - #61866 (Remove redundant `clone()`s)
 - #61869 (Cleanup some new active feature gates)

Failed merges:

r? @ghost
@bors bors merged commit d54b27d into rust-lang:master Jun 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#61817 Miri does not figure out its sysroot at build time
4 participants
@RalfJung @rust-highfive @oli-obk @bors