diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-05-02 17:40:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 17:40:23 +0000 |
| commit | 3ae6b180ddba4b28582662312bfb56402fb096a0 (patch) | |
| tree | a6853a464b5bfdc31ce122f2156080322798235f /Cargo.toml | |
| parent | 609d4296e292121929a2e82c6856d7d42fb6dedb (diff) | |
| parent | 9703fb350b226960d35cc407ac89ba98a489202a (diff) | |
| parent | 92c5cfe8d39b1354757a4429b18f366f72a27619 (diff) | |
| download | nix-3ae6b180ddba4b28582662312bfb56402fb096a0.zip | |
Merge #1227 #1228
1227: Test on Rust stable again r=asomers a=asomers
This commit reverts eba3b516f7f76465e2fbe1c16724786144f01e8e, which
worked around a Travis CI bug that has since been fixed. The effect is
to resume testing on the latest Rust stable.
1228: Fix an "unused macro" warning on non-Linux platforms r=asomers a=asomers
cc @glebpom
Co-authored-by: Alan Somers <asomers@gmail.com>