From dbb04e310c061612a1bc585776c23400299e7ad0 Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Sun, 24 Feb 2019 15:41:26 -0800
Subject: [PATCH] Fix rustfmt check (#927)

* Add set -e to .travis.yml
* Fix fmt
* Fix codec feature
---
 .travis.yml          | 4 ++++
 Cargo.toml           | 2 +-
 tokio-buf/src/lib.rs | 4 ++--
 tokio-buf/src/u8.rs  | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54d234923..58ebdf5bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,11 @@ matrix:
 
   # Test combinations of enabled features and rustfmt
   - rust: stable
+    before_script: |
+      rustup component add rustfmt
     script: |
+      set -e
+
       cargo fmt --all -- --check
       shopt -s expand_aliases
       alias check="cargo check --no-default-features"
diff --git a/Cargo.toml b/Cargo.toml
index 96723d6c3..950f1cb9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,7 +59,7 @@ default = [
   "uds",
 ]
 
-codec = ["tokio-codec"]
+codec = ["io", "tokio-codec"]
 fs = ["tokio-fs"]
 io = ["bytes", "tokio-io"]
 reactor = ["io", "mio", "tokio-reactor"]
diff --git a/tokio-buf/src/lib.rs b/tokio-buf/src/lib.rs
index 0c4d7bd83..2261d518e 100644
--- a/tokio-buf/src/lib.rs
+++ b/tokio-buf/src/lib.rs
@@ -17,11 +17,11 @@ extern crate either;
 extern crate futures;
 
 mod never;
-#[cfg(feature = "util")]
-pub mod util;
 mod size_hint;
 mod str;
 mod u8;
+#[cfg(feature = "util")]
+pub mod util;
 
 pub use self::size_hint::SizeHint;
 #[doc(inline)]
diff --git a/tokio-buf/src/u8.rs b/tokio-buf/src/u8.rs
index dece1d7c9..4b1bc58ea 100644
--- a/tokio-buf/src/u8.rs
+++ b/tokio-buf/src/u8.rs
@@ -1,8 +1,8 @@
-use BufStream;
-use never::Never;
 use bytes::{Bytes, BytesMut};
 use futures::Poll;
+use never::Never;
 use std::io;
+use BufStream;
 
 impl BufStream for Vec<u8> {
     type Item = io::Cursor<Vec<u8>>;