Skip to content

Follow up to #51508, make parse_block public instead parse_block_expr #51549

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
Merged
merged 1 commit into from
Jun 17, 2018
Merged

Follow up to #51508, make parse_block public instead parse_block_expr #51549

merged 1 commit into from
Jun 17, 2018

Conversation

PSeitz
Copy link
Contributor

@PSeitz PSeitz commented Jun 14, 2018

This is an follow up to #51508

I mistakenly made parse_block_expr public instead of parse_block.
This fixes this.

@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 14, 2018
@kennytm
Copy link
Member

kennytm commented Jun 14, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 14, 2018

📌 Commit 8096b31 has been approved by kennytm

@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, 2018
@bors
Copy link
Collaborator

bors commented Jun 14, 2018

⌛ Testing commit 8096b31720e487d79d8dbef557a53ab055861a38 with merge 2bef91921e2146de30eb27cc1db20d893979b7ae...

@bors
Copy link
Collaborator

bors commented Jun 14, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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, 2018
@kennytm
Copy link
Member

kennytm commented Jun 14, 2018

@bors retry

C:\Python27\python2.7.exe: can't open file 'src/ci/docker/x86_64-gnu-tools/checkregression.py': [Errno 2] No such file or directory
C:\Python27\python2.7.exe: can't open file 'src/ci/docker/x86_64-gnu-tools/checkregression.py': [Errno 2] No such file or directory

🤔

@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, 2018
@bors
Copy link
Collaborator

bors commented Jun 14, 2018

⌛ Testing commit 8096b31720e487d79d8dbef557a53ab055861a38 with merge 7684f4a1d9c6a22bcdb98b03ce6b7794dbd8163d...

@bors
Copy link
Collaborator

bors commented Jun 14, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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, 2018
@kennytm
Copy link
Member

kennytm commented Jun 14, 2018

@bors retry rollup

@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, 2018
@bors
Copy link
Collaborator

bors commented Jun 14, 2018

⌛ Testing commit 8096b31720e487d79d8dbef557a53ab055861a38 with merge 76330b23c66689fb06dfb8099be1a72198070be0...

@bors
Copy link
Collaborator

bors commented Jun 14, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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, 2018
@PSeitz
Follow up on rust-lang#51508, make parse_block public instead parse_b…
b1c0857 
…lock_expr

This is an follow up to rust-lang#51508

I mistakenly made parse_block_expr public instead of parse_block.
This fixes this.
@PSeitz
Copy link
Contributor Author

PSeitz commented Jun 16, 2018

Rebased, tests were broken on nightly.

@Mark-Simulacrum
Copy link
Member

@bors retry

@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 16, 2018
@kennytm
Copy link
Member

kennytm commented Jun 17, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 17, 2018

📌 Commit b1c0857 has been approved by kennytm

@bors
Copy link
Collaborator

bors commented Jun 17, 2018

⌛ Testing commit b1c0857 with merge 9181741...

bors added a commit that referenced this pull request Jun 17, 2018
@bors
Auto merge of #51549 - PSeitz:patch-1, r=kennytm
9181741 
Follow up to #51508, make parse_block public instead parse_block_expr

This is an follow up to #51508

I mistakenly made parse_block_expr public instead of parse_block.
This fixes this.
@bors
Copy link
Collaborator

bors commented Jun 17, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 9181741 to master...

@bors bors merged commit b1c0857 into rust-lang:master Jun 17, 2018
@PSeitz PSeitz deleted the patch-1 branch June 17, 2018 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

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.
6 participants
@PSeitz @rust-highfive @kennytm @bors @Mark-Simulacrum @pnkfelix