Bump rustfmt

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-29
+  - rust: nightly-2017-12-12
     env: RUSTFMT=YESPLEASE
     script:
     - |
       if ! [ -x "$(command -v rustfmt)" ]; then
-        cargo install rustfmt-nightly --vers 0.2.16
+        cargo install rustfmt-nightly --vers 0.3.1
       fi
     - cargo fmt --all -- --write-mode=diff
 env:

diesel/src/macros/mod.rs

@@ -1036,7 +1036,6 @@ macro_rules! joinable_inner {
     }
 }
 
-
 /// Allow two or more tables which are otherwise unrelated to be used together
 /// in a query.
 ///

diesel/src/mysql/connection/mod.rs

@@ -116,11 +116,8 @@ impl MysqlConnection {
     where
         T: QueryFragment<Mysql> + QueryId,
     {
-        let mut stmt = self.statement_cache.cached_statement(
-            source,
-            &[],
-            |sql| self.raw_connection.prepare(sql),
-        )?;
+        let mut stmt = self.statement_cache
+            .cached_statement(source, &[], |sql| self.raw_connection.prepare(sql))?;
         let mut bind_collector = RawBytesBindCollector::<Mysql>::new();
         try!(source.collect_binds(&mut bind_collector, &()));
         let metadata = bind_collector.metadata;

diesel/src/mysql/connection/raw.rs

@@ -204,7 +204,8 @@ fn perform_thread_unsafe_library_initialization() {
     MYSQL_THREAD_UNSAFE_INIT.call_once(|| {
         // mysql_library_init is defined by `#define mysql_library_init mysql_server_init`
         // which isn't picked up by bindgen
-        let error_code = unsafe { ffi::mysql_server_init(0, ptr::null_mut(), ptr::null_mut()) };
+        let error_code =
+            unsafe { ffi::mysql_server_init(0, ptr::null_mut(), ptr::null_mut()) };
         if error_code != 0 {
             // FIXME: This is documented as Nonzero if an error occurred.
             // Presumably the value has some sort of meaning that we should

diesel/src/mysql/connection/stmt/mod.rs

@@ -82,7 +82,6 @@ impl Statement {
         NamedStatementIterator::new(self)
     }
 
-
     fn last_error_message(&self) -> String {
         unsafe { CStr::from_ptr(ffi::mysql_stmt_error(self.stmt)) }
             .to_string_lossy()

diesel/src/mysql/connection/url.rs

@@ -77,7 +77,7 @@ fn decode_into_cstring(s: &str) -> ConnectionResult<CString> {
     let decoded = try!(
         percent_decode(s.as_bytes())
             .decode_utf8()
-            .map_err(|_| { connection_url_error() })
+            .map_err(|_| connection_url_error())
     );
     CString::new(decoded.as_bytes()).map_err(Into::into)
 }
@@ -139,8 +139,7 @@ fn userinfo_should_be_percent_decode() {
 
     let db_url = format!(
         "mysql://{}:{}@localhost/bar",
-        encoded_username,
-        encoded_password
+        encoded_username, encoded_password
     );
     let db_url = Url::parse(&db_url).unwrap();
 

diesel/src/mysql/types/date_and_time.rs

@@ -98,9 +98,7 @@ impl FromSql<Timestamp, Mysql> for NaiveDateTime {
                 mysql_time.second_part as u32,
             )
         })
-            .ok_or_else(|| {
-                format!("Cannot parse this date: {:?}", mysql_time).into()
-            })
+            .ok_or_else(|| format!("Cannot parse this date: {:?}", mysql_time).into())
     }
 }
 
@@ -126,9 +124,7 @@ impl FromSql<Time, Mysql> for NaiveTime {
             mysql_time.hour as u32,
             mysql_time.minute as u32,
             mysql_time.second as u32,
-        ).ok_or_else(|| {
-            format!("Unable to convert {:?} to chrono", mysql_time).into()
-        })
+        ).ok_or_else(|| format!("Unable to convert {:?} to chrono", mysql_time).into())
     }
 }
 
@@ -154,9 +150,7 @@ impl FromSql<Date, Mysql> for NaiveDate {
             mysql_time.year as i32,
             mysql_time.month as u32,
             mysql_time.day as u32,
-        ).ok_or_else(|| {
-            format!("Unable to convert {:?} to chrono", mysql_time).into()
-        })
+        ).ok_or_else(|| format!("Unable to convert {:?} to chrono", mysql_time).into())
     }
 }
 

diesel/src/mysql/types/numeric.rs

@@ -25,9 +25,8 @@ pub mod bigdecimal {
     impl FromSql<types::Numeric, Mysql> for BigDecimal {
         fn from_sql(bytes: Option<&[u8]>) -> Result<Self, Box<Error + Send + Sync>> {
             let bytes = not_none!(bytes);
-            BigDecimal::parse_bytes(bytes, 10).ok_or_else(|| {
-                Box::from(format!("{:?} is not valid decimal number ", bytes))
-            })
+            BigDecimal::parse_bytes(bytes, 10)
+                .ok_or_else(|| Box::from(format!("{:?} is not valid decimal number ", bytes)))
         }
     }
 

diesel/src/pg/connection/stmt/mod.rs

@@ -32,9 +32,7 @@ impl Statement {
             .collect::<Vec<_>>();
         let param_lengths = param_data
             .iter()
-            .map(|data| {
-                data.as_ref().map(|d| d.len() as libc::c_int).unwrap_or(0)
-            })
+            .map(|data| data.as_ref().map(|d| d.len() as libc::c_int).unwrap_or(0))
             .collect::<Vec<_>>();
         let internal_res = unsafe {
             conn.exec_prepared(

diesel/src/pg/types/date_and_time/mod.rs

@@ -172,9 +172,9 @@ impl FromSql<types::Interval, Pg> for PgInterval {
         Ok(PgInterval {
             microseconds: try!(FromSql::<types::BigInt, Pg>::from_sql(Some(&bytes[..8]))),
             days: try!(FromSql::<types::Integer, Pg>::from_sql(Some(&bytes[8..12]))),
-            months: try!(FromSql::<types::Integer, Pg>::from_sql(
-                Some(&bytes[12..16])
-            )),
+            months: try!(FromSql::<types::Integer, Pg>::from_sql(Some(
+                &bytes[12..16]
+            ))),
         })
     }
 }