Obey rustfmt

Reformatted the code using cargo fmt.
Added a separate Travis job to the build matrix that fails when code is
not properly formatted

Author: cyplo

.travis.yml

@@ -6,6 +6,13 @@ language: rust
 
 matrix:
   include:
+    # Separate build to detect if the code is formatted correctly
+    - os: linux
+      env: TARGET=x86_64-unknown-linux-gnu
+           DOCKER=alexcrichton/rust-slave-dist:2015-10-20b
+           RUSTFMT_ONLY=1
+           NO_ADD=1
+           ALLOW_PR=1
     # Linux builds use the `rust-slave-dist` image so we link them against a
     # "super old glibc" to ensure that it runs on as many platforms as possible.
     - os: linux
@@ -124,6 +131,7 @@ branches:
 
 install:
   - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
+  - rustup component add rustfmt-preview 
 
 script:
   - mkdir -p target/$TARGET;
@@ -134,7 +142,7 @@ script:
         echo 'skipping master build';
     else
         if [ ! -z "$DOCKER" ]; then
-            sh ci/build-run-docker.sh "$DOCKER" "$TARGET" "$SKIP_TESTS";
+            sh ci/build-run-docker.sh "$DOCKER" "$TARGET" "$SKIP_TESTS" "$RUSTFMT_ONLY";
         else
             PATH=$HOME/rust/bin:$PATH sh ci/run.sh;
         fi

build.rs

@@ -8,7 +8,8 @@ use std::process::Command;
 struct Ignore;
 
 impl<E> From<E> for Ignore
-    where E: Error
+where
+    E: Error,
 {
     fn from(_: E) -> Ignore {
         Ignore
@@ -35,18 +36,21 @@ fn commit_info() -> String {
 }
 
 fn commit_hash() -> Result<String, Ignore> {
-    Ok(try!(String::from_utf8(try!(Command::new("git")
-                                       .args(&["rev-parse", "--short=9", "HEAD"])
-                                       .output())
-                                  .stdout)))
+    Ok(try!(String::from_utf8(
+        try!(
+            Command::new("git")
+                .args(&["rev-parse", "--short=9", "HEAD"])
+                .output()
+        ).stdout
+    )))
 }
 
 fn commit_date() -> Result<String, Ignore> {
-    Ok(try!(String::from_utf8(try!(Command::new("git")
-                                       .args(&["log",
-                                               "-1",
-                                               "--date=short",
-                                               "--pretty=format:%cd"])
-                                       .output())
-                                  .stdout)))
+    Ok(try!(String::from_utf8(
+        try!(
+            Command::new("git")
+                .args(&["log", "-1", "--date=short", "--pretty=format:%cd"])
+                .output()
+        ).stdout
+    )))
 }

ci/build-run-docker.sh

@@ -7,6 +7,7 @@ mkdir -p target
 DOCKER="$1"
 TARGET="$2"
 SKIP_TESTS="$3"
+RUSTFMT_ONLY="$4"
 
 if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then
   docker build -t "$DOCKER" "ci/docker/$DOCKER/"
@@ -21,6 +22,7 @@ docker run \
   --workdir /src \
   --env TARGET=$TARGET \
   --env SKIP_TESTS=$SKIP_TESTS \
+  --env RUSTFMT_ONLY=$RUSTFMT_ONLY \
   $DOCKER \
   ci/run-docker.sh
 

ci/run.sh

@@ -7,7 +7,11 @@ echo "toolchain versions\n------------------"
 rustc -vV
 cargo -vV
 
-cargo build --locked -v --release --target $TARGET
+if [ ! -z "$RUSTFMT_ONLY" ]; then
+    cargo fmt --all -- --write-mode=diff
+else
+    cargo build --locked -v --release --target $TARGET
+fi
 
 if [ -z "$SKIP_TESTS" ]; then
   cargo test --release -p download --target $TARGET

src/download/src/errors.rs

@@ -1,5 +1,3 @@
-
-
 error_chain! {
     links { }