From 4e0938d349e95cf6bc8edd1d48197db65c8ecd87 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Tue, 27 Nov 2018 21:11:05 +0100
Subject: [PATCH] Let travis run cargo fmt --all -- --check

---
 .travis.yml      | 5 +++--
 ci/base-tests.sh | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8730535d629e..45fc5278517f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ before_install:
 install:
   - |
     if [ -z ${INTEGRATION} ]; then
+      rustup component add rustfmt-preview || cargo install --git https://github.com/rust-lang/rustfmt/ --force
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         . $HOME/.nvm/nvm.sh
         nvm install stable
@@ -48,7 +49,7 @@ matrix:
     - os: linux
       env: BASE_TESTS=true
     - os: windows
-      env: BASE_TEST=true
+      env: BASE_TESTS=true
     - env: INTEGRATION=rust-lang/cargo
     - env: INTEGRATION=rust-random/rand
     - env: INTEGRATION=rust-lang-nursery/stdsimd
@@ -64,7 +65,7 @@ matrix:
     - env: INTEGRATION=hyperium/hyper
   allow_failures:
   - os: windows
-    env: BASE_TEST=true
+    env: BASE_TESTS=true
 # prevent these jobs with default env vars
   exclude:
     - os: linux
diff --git a/ci/base-tests.sh b/ci/base-tests.sh
index 88cc20842e82..e46f8c4c39a2 100755
--- a/ci/base-tests.sh
+++ b/ci/base-tests.sh
@@ -26,6 +26,7 @@ cd clippy_dev && cargo test && cd ..
 
 # Perform various checks for lint registration
 ./util/dev update_lints --check
+cargo +nightly fmt --all -- --check
 
 CLIPPY="`pwd`/target/debug/cargo-clippy clippy"
 # run clippy on its own codebase...