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 outstanding PRs #1

Merged
merged 8 commits into from
Apr 4, 2017
Merged

Rollup of outstanding PRs #1

merged 8 commits into from
Apr 4, 2017

Conversation

rillian
Copy link

@rillian rillian commented Apr 4, 2017

Here's all the outstanding pull requests from the upstream repository. Not the ideal rebase order, but at least it brings things up to date a bit.

Doesn't address the build failure on 1.18.0-nightly. I suspect we need another syntex bump to get a compatible serde_derive.

nox and others added 8 commits August 29, 2016 12:26
Update to the current toml crate. I was trying to resolve build issues
on rustc 1.18.0-nightly. This wasn't the culprit but it's good to
stay current for 0.x dependencies.
…rges

Rebase on top of Matthew's Option<fn(..)> changes.

Hopefully resolves the build issue with 1.18.0-nightly.
… merges

Rebase on top of more recent changes; this just bumps the clap dep now.
@kinetiknz
Copy link
Owner

LGTM

@kinetiknz kinetiknz merged commit 75cb640 into kinetiknz:master Apr 4, 2017
@kinetiknz
Copy link
Owner

Sean1708#35

This wasn't included in the PR.

@rillian
Copy link
Author

rillian commented Apr 4, 2017

Sean1708#35

This wasn't included in the PR.

Oops, you're right. I was going to include it, but then held off because it's a breaking change. But the Option<fn> fix is technically also a breaking change, so I'll go ahead and do that in another PR and bump the version number.

kinetiknz pushed a commit that referenced this pull request Apr 11, 2017
Change package name to moz-cheddar
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.

5 participants