Skip to content

Changed usages of mir in librustc::mir and librustc_mir to body #61506

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jun 10, 2019

Conversation

imbrem
Copy link
Contributor

@imbrem imbrem commented Jun 3, 2019

Work on part 2 of #60229

@rust-highfive
Copy link
Contributor

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2019
@imbrem
Copy link
Contributor Author

imbrem commented Jun 4, 2019

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned pnkfelix Jun 4, 2019
@bors
Copy link
Collaborator

bors commented Jun 4, 2019

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

@eddyb
Copy link
Member

eddyb commented Jun 5, 2019

r=me after a rebase

@imbrem imbrem force-pushed the mir_body_renaming branch from b465de5 to 049003c Compare June 5, 2019 19:16
@imbrem
Copy link
Contributor Author

imbrem commented Jun 5, 2019

@eddyb finished the rebase! Hope I did it right...

@bors
Copy link
Collaborator

bors commented Jun 6, 2019

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

@imbrem imbrem force-pushed the mir_body_renaming branch from 049003c to 0111865 Compare June 8, 2019 04:23
@imbrem
Copy link
Contributor Author

imbrem commented Jun 8, 2019

@eddyb rebased again!

@bors
Copy link
Collaborator

bors commented Jun 9, 2019

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

@imbrem imbrem force-pushed the mir_body_renaming branch from 0111865 to 80ff07f Compare June 9, 2019 20:05
@imbrem
Copy link
Contributor Author

imbrem commented Jun 9, 2019

@eddyb rebased yet again haha

@Centril
Copy link
Contributor

Centril commented Jun 10, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned eddyb Jun 10, 2019
@eddyb
Copy link
Member

eddyb commented Jun 10, 2019

@Centril @oli-obk Sorry for not seeing this, but someone should've r=me'd the PR.
@bors r+

@bors
Copy link
Collaborator

bors commented Jun 10, 2019

📌 Commit 80ff07f has been approved by eddyb

@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 10, 2019
@Centril
Copy link
Contributor

Centril commented Jun 10, 2019

@bors p=5

@bors
Copy link
Collaborator

bors commented Jun 10, 2019

⌛ Testing commit 80ff07f with merge 1cbd8a4...

bors added a commit that referenced this pull request Jun 10, 2019
Changed usages of `mir` in librustc::mir and librustc_mir to `body`

Work on part 2 of #60229
@bors
Copy link
Collaborator

bors commented Jun 10, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 1cbd8a4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 10, 2019
@bors bors merged commit 80ff07f into rust-lang:master Jun 10, 2019
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #61506!

Tested on commit 1cbd8a4.
Direct link to PR: #61506

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

7 participants