Skip to content

Some miri cleanups#46743

Merged
bors merged 1 commit into
rust-lang:masterfrom
oli-obk:miri
Dec 16, 2017
Merged

Some miri cleanups#46743
bors merged 1 commit into
rust-lang:masterfrom
oli-obk:miri

Conversation

@oli-obk

@oli-obk oli-obk commented Dec 15, 2017

Copy link
Copy Markdown
Contributor

r? @eddyb

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the new substs field on EvalContext just for this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jup. We used to push a stackframe just to have substs.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the substs part and just simplified the interface

@oli-obk oli-obk force-pushed the miri branch 2 times, most recently from 47dc339 to 0d68080 Compare December 15, 2017 10:19
@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 15, 2017

@kennytm kennytm Dec 15, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh strange. Why these two arms are not merged 😄

    (_, Err(err)) => Err(err),

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the next commit will unmerge them because it's going to process the miri result ;)

@eddyb

eddyb commented Dec 15, 2017

Copy link
Copy Markdown
Contributor

@bors delegate=oli-obk

r=me with @kennytm's nit fixed

@bors

bors commented Dec 15, 2017

Copy link
Copy Markdown
Collaborator

✌️ @oli-obk can now approve this pull request

@oli-obk

oli-obk commented Dec 15, 2017

Copy link
Copy Markdown
Contributor Author

@bors r=eddyb

@bors

bors commented Dec 15, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 2d161f1 has been approved by eddyb

@kennytm kennytm 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 Dec 16, 2017
@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2d161f1 with merge 4f2ef41...

bors added a commit that referenced this pull request Dec 16, 2017
@bors

bors commented Dec 16, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 4f2ef41 to master...

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.

4 participants