Skip to content

update miri - #61832

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri
Jun 16, 2019
Merged

update miri#61832
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:miri

Conversation

@RalfJung

@RalfJungRalfJung commented Jun 14, 2019•
edited
Loading

Copy link
Copy Markdown
Member

@rust-highfive

rust-highfive commented Jun 14, 2019

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • These commits modify submodules.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 14, 2019
@oli-obk

oli-obk commented Jun 14, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 7412e7004ac28cb086eebd2e3bc26407b0955ffb has been approved by oli-obk

@borsbors 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

RalfJung commented Jun 14, 2019

Copy link
Copy Markdown
MemberAuthor

Miri got broken again.

@bors r-

@borsbors 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

RalfJung commented Jun 14, 2019•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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

RalfJung commented Jun 15, 2019

Copy link
Copy Markdown
MemberAuthor

That's looking very green.

@bors r=oli-obk

@bors

bors commented Jun 15, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit d54b27d has been approved by oli-obk

@borsbors 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 ofrust-lang#61832- RalfJung:miri, r=oli-obk
59714d7
update miri
Fixesrust-lang#61830Fixesrust-lang#61848
r? @oli-obk
@CentrilCentril 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 ofrust-lang#61832- RalfJung:miri, r=oli-obk
af56111
update miri
Fixesrust-lang#61830Fixesrust-lang#61848
r? @oli-obk
@CentrilCentril 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:masterJun 16, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obkoli-obk

Labels

S-waiting-on-borsStatus: 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