Merge branch 'master' of https://github.com/rust-lang/rustfmt into ignore-with-glob

Author: rchaser53

.travis.yml

@@ -28,19 +28,19 @@ matrix:
     - env: INTEGRATION=mdbook
     - env: INTEGRATION=packed_simd
     - env: INTEGRATION=rand
-    - env: INTEGRATION=rust-clippy
     - env: INTEGRATION=rust-semverver
     - env: INTEGRATION=stdsimd TARGET=x86_64-unknown-linux-gnu
     - env: INTEGRATION=tempdir
+    - env: INTEGRATION=futures-rs
   allow_failures:
+    # Doesn't build - keep this in allow_failures as it's fragile to breaking changes of rustc.
+    - env: INTEGRATION=rust-clippy
     # Doesn't build - seems to be because of an option
     - env: INTEGRATION=packed_simd
     # Doesn't build - a temporal build failure due to breaking changes in the nightly compilre
     - env: INTEGRATION=rust-semverver
     # can be moved back to include section after https://github.com/rust-lang-nursery/failure/pull/298 is merged
     - env: INTEGRATION=failure
-    # can be moved back once https://github.com/rust-lang-nursery/futures-rs/pull/1445 is merged
-    - env: INTEGRATION=futures-rs
 
 script:
   - |