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.

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

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

Commits on Aug 29, 2016

  1. Update syntex to 0.42

    @nox
    nox committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    58885be View commit details
    Browse the repository at this point in the history

  2. Allow the crate to be compiled without syntex

    @nox
    nox committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    31078a9 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. Fix markdown typo

    @SimonSapin
    SimonSapin authored Dec 14, 2016
    Configuration menu
    Copy the full SHA
    cd14ef2 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. Upgrade to clap 2.x and toml 0.2

    @mbrubeck
    mbrubeck committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    61262f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2017

  1. fix: update to toml 0.3.2. 

    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.
    @rillian
    rillian committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    0b6eb82 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'kinetik/master' into merges

    @rillian
    rillian committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    4be84db View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2017

  1. Merge branch 'syntex' of https://github.com/nox/rusty-cheddar into me… 

    …rges

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

Hopefully resolves the build issue with 1.18.0-nightly.
    @rillian
    rillian committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    97861ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'deps' of https://github.com/mbrubeck/rusty-cheddar into… 

    … merges

Rebase on top of more recent changes; this just bumps the clap dep now.
    @rillian
    rillian committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    569090d View commit details
    Browse the repository at this point in the history