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

Forward merge v5 fixes #143

Merged
merged 15 commits into from
Mar 18, 2021
Merged

Forward merge v5 fixes #143

merged 15 commits into from
Mar 18, 2021

Conversation

richardwhiuk
Copy link
Contributor

This merges forward a couple of features merged into v5 - primarily

It also fixes a clippy lint we were living with in v5.

richardwhiuk and others added 14 commits January 20, 2021 23:25
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
140: Expose CompositeMakeServiceEntry r=richardwhiuk a=richardwhiuk

Signed-off-by: Richard Whitehouse <[email protected]>

Co-authored-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
139: Support conversion for AnyOf and OneOf r=richardwhiuk a=richardwhiuk

Signed-off-by: Richard Whitehouse <[email protected]>

Co-authored-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
Signed-off-by: Richard Whitehouse <[email protected]>
@richardwhiuk
Copy link
Contributor Author

bors r+

bors bot added a commit that referenced this pull request Mar 18, 2021
143: Forward merge v5 fixes r=richardwhiuk a=richardwhiuk

This merges forward a couple of features merged into v5 - primarily
- #139 - Support conversion for AnyOf and OneOf
- #140 - Expose CompositeMakeServiceEntry

It also fixes a clippy lint we were living with in v5.

Co-authored-by: Richard Whitehouse <[email protected]>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
@bors
Copy link
Contributor

bors bot commented Mar 18, 2021

Build failed:

src/request_parser.rs Show resolved Hide resolved
src/request_parser.rs Show resolved Hide resolved
Signed-off-by: Richard Whitehouse <[email protected]>
@bossmc
Copy link
Contributor

bossmc commented Mar 18, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 18, 2021

Build succeeded:

@bors bors bot merged commit 88cce39 into master Mar 18, 2021
@bors bors bot deleted the merge-v5 branch March 18, 2021 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants