diff --git a/.travis.yml b/.travis.yml index 568f493..20a98d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,11 @@ rust: - stable - beta - nightly -before_install: - - bash ./tests/scripts/rustfmt.sh script: - - cargo fmt -- --write-mode diff - cargo test + - rustup component add rustfmt-preview + - cargo fmt -- --write-mode diff matrix: allow_failures: - rust: nightly diff --git a/src/lib.rs b/src/lib.rs index 3696813..9e5aa7b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,8 @@ +extern crate failure; #[macro_use] extern crate serde_derive; extern crate serde_json; extern crate toml; -extern crate failure; use std::fs::File; use std::io::prelude::*; diff --git a/tests/scripts/rustfmt.sh b/tests/scripts/rustfmt.sh deleted file mode 100644 index 6836314..0000000 --- a/tests/scripts/rustfmt.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -which rustfmt > /dev/null - -if [[ $? -ne 0 ]]; then - cargo install rustfmt -else - current_version=$(rustfmt --version | cut -d '-' -f 1 | xargs) - upstream_version=$(cargo search rustfmt | head -n 1 | cut -d ' ' -f 3 | tr -d '"' | xargs) - if [ $current_version != $upstream_version ]; then - cargo install rustfmt --force - fi -fi