Update rustfmt again

Author: sgrif

.travis.yml

@@ -55,12 +55,12 @@ matrix:
     - (cd diesel_migrations && cargo rustc --no-default-features --features "lint dotenv sqlite postgres mysql" -- -Zno-trans)
     - (cd diesel_infer_schema && cargo rustc --no-default-features --features "lint dotenv sqlite postgres mysql" -- -Zno-trans)
     - (cd diesel_compile_tests && travis-cargo test)
-  - rust: nightly-2017-11-07
+  - rust: nightly-2017-11-29
     env: RUSTFMT=YESPLEASE
     script:
     - |
       if ! [ -x "$(command -v rustfmt)" ]; then
-        cargo install rustfmt-nightly --vers 0.2.15
+        cargo install rustfmt-nightly --vers 0.2.16
       fi
     - cargo fmt --all -- --write-mode=diff
 env:

diesel/src/expression_methods/eq_all.rs

@@ -33,10 +33,8 @@ where
     L2: EqAll<R2>,
     L3: EqAll<R3>,
 {
-    type Output = And<
-        <L1 as EqAll<R1>>::Output,
-        And<<L2 as EqAll<R2>>::Output, <L3 as EqAll<R3>>::Output>,
-    >;
+    type Output =
+        And<<L1 as EqAll<R1>>::Output, And<<L2 as EqAll<R2>>::Output, <L3 as EqAll<R3>>::Output>>;
 
     fn eq_all(self, rhs: (R1, R2, R3)) -> Self::Output {
         self.0

diesel/src/mysql/connection/bind.rs

@@ -229,10 +229,10 @@ fn known_buffer_size_for_ffi_type(tpe: ffi::enum_field_types) -> Option<usize> {
         t::MYSQL_TYPE_YEAR | t::MYSQL_TYPE_SHORT => Some(2),
         t::MYSQL_TYPE_INT24 | t::MYSQL_TYPE_LONG | t::MYSQL_TYPE_FLOAT => Some(4),
         t::MYSQL_TYPE_LONGLONG | t::MYSQL_TYPE_DOUBLE => Some(8),
-        t::MYSQL_TYPE_TIME |
-        t::MYSQL_TYPE_DATE |
-        t::MYSQL_TYPE_DATETIME |
-        t::MYSQL_TYPE_TIMESTAMP => Some(size_of::<ffi::MYSQL_TIME>()),
+        t::MYSQL_TYPE_TIME
+        | t::MYSQL_TYPE_DATE
+        | t::MYSQL_TYPE_DATETIME
+        | t::MYSQL_TYPE_TIMESTAMP => Some(size_of::<ffi::MYSQL_TIME>()),
         _ => None,
     }
 }

diesel/src/query_builder/select_statement/dsl_impls.rs

@@ -228,17 +228,8 @@ where
 }
 
 impl<F, S, W, O, L, Of> ForUpdateDsl for SelectStatement<F, S, NoDistinctClause, W, O, L, Of> {
-    type Output = SelectStatement<
-        F,
-        S,
-        NoDistinctClause,
-        W,
-        O,
-        L,
-        Of,
-        NoGroupByClause,
-        ForUpdateClause,
-    >;
+    type Output =
+        SelectStatement<F, S, NoDistinctClause, W, O, L, Of, NoGroupByClause, ForUpdateClause>;
 
     fn for_update(self) -> Self::Output {
         SelectStatement::new(

diesel_cli/tests/migration_list.rs

@@ -1,4 +1,3 @@
-
 use chrono::Utc;
 use std::thread::sleep;
 use std::time::Duration;

diesel_cli/tests/setup.rs

@@ -48,7 +48,9 @@ fn setup_creates_default_migration_file() {
     let result = p.command("setup").run();
 
     assert!(result.is_success(), "Result was unsuccessful {:?}", result);
-    assert!(p.has_file(Path::new("migrations").join("00000000000000_diesel_initial_setup")));
+    assert!(p.has_file(
+        Path::new("migrations").join("00000000000000_diesel_initial_setup")
+    ));
 }
 
 #[test]