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.

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

Rollup of 3 pull requests #51521

Merged
merged 7 commits into from Jun 12, 2018
Merged

Rollup of 3 pull requests #51521

merged 7 commits into from Jun 12, 2018

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

jebrosen and others added 7 commits June 11, 2018 10:40
…Simulacrum

Make parse_seq_to_end and parse_path public

(see rwf2/Rocket#660, rust-lang#51265)

Rocket currently uses `parse_seq_to_end` and `parse_path` in its codegen macros. Assuming I tested correctly, this is the minimal set of methods that are currently necessary to build Rocket again. I would be happy to add documentation of this and Rocket's other usages, if desired.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 12, 2018
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1

r? @Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jun 12, 2018

📌 Commit 398e570 has been approved by Mark-Simulacrum

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

bors commented Jun 12, 2018

⌛ Testing commit 398e570 with merge b68432d...

bors added a commit that referenced this pull request Jun 12, 2018
Rollup of 3 pull requests

Successful merges:

 - #51261 (Updated RELEASES.md for 1.27.0)
 - #51502 (Make parse_seq_to_end and parse_path public)
 - #51510 (Long diagnostic for E0538)

Failed merges:
@bors
Copy link
Contributor

bors commented Jun 12, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing b68432d to master...

@bors bors merged commit 398e570 into rust-lang:master Jun 12, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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.

None yet

7 participants