Merge pull request diesel-rs#1743 from diesel-rs/sg-bump-rustfmt

Update rustfmt

Author: sgrif

.rustfmt.toml

@@ -46,10 +46,10 @@ matrix:
     - (cd diesel_derives && cargo rustc --no-default-features --features "lint" -- -Zno-trans)
     - (cd diesel_migrations && cargo rustc --no-default-features --features "lint dotenv sqlite postgres mysql" -- -Zno-trans)
     - (cd diesel_compile_tests && travis-cargo test)
-  - rust: nightly-2018-03-15
+  - rust: 1.26.1
     env: RUSTFMT=YESPLEASE
     script:
-    - cargo install rustfmt-nightly --vers 0.3.7 --force
+    - rustup component add rustfmt-preview
     - cargo fmt --all -- --write-mode=diff
   - rust: stable
     env:

.travis.yml

@@ -1,9 +1,9 @@
+use super::{HasTable, Identifiable};
 use dsl::{Eq, EqAny, Filter, FindBy};
-use expression::AsExpression;
 use expression::array_comparison::AsInExpression;
-use query_dsl::methods::FilterDsl;
+use expression::AsExpression;
 use prelude::*;
-use super::{HasTable, Identifiable};
+use query_dsl::methods::FilterDsl;
 
 use std::borrow::Borrow;
 use std::hash::Hash;

diesel/src/associations/belongs_to.rs

@@ -2,8 +2,8 @@
 
 use byteorder::ByteOrder;
 
-use query_builder::QueryBuilder;
 use query_builder::bind_collector::BindCollector;
+use query_builder::QueryBuilder;
 use sql_types::{self, HasSqlType};
 
 /// A database backend

diesel/src/backend.rs

@@ -11,9 +11,9 @@ use query_builder::{AsQuery, QueryFragment, QueryId};
 use result::*;
 use sql_types::HasSqlType;
 
-pub use self::transaction_manager::{AnsiTransactionManager, TransactionManager};
 #[doc(hidden)]
 pub use self::statement_cache::{MaybeCached, StatementCache, StatementCacheKey};
+pub use self::transaction_manager::{AnsiTransactionManager, TransactionManager};
 
 /// Perform simple operations on a backend.
 ///

diesel/src/connection/mod.rs

@@ -251,7 +251,9 @@ where
         Err(e) => {
             error = Some(e);
             #[cfg_attr(feature = "clippy", allow(invalid_ref))]
-            unsafe { mem::uninitialized() }
+            unsafe {
+                mem::uninitialized()
+            }
         }
     });
     match error {

diesel/src/connection/statement_cache.rs

@@ -1,6 +1,6 @@
 use backend::Backend;
-use expression::*;
 use expression::subselect::Subselect;
+use expression::*;
 use query_builder::*;
 use result::QueryResult;
 use sql_types::Bool;

diesel/src/expression/array_comparison.rs

@@ -1,11 +1,11 @@
 use std::marker::PhantomData;
 
+use super::*;
 use backend::Backend;
 use query_builder::*;
 use result::QueryResult;
 use serialize::ToSql;
 use sql_types::HasSqlType;
-use super::*;
 
 #[derive(Debug, Clone, Copy, DieselNumericOps)]
 pub struct Bound<T, U> {

diesel/src/expression/bound.rs

@@ -1,7 +1,7 @@
+use super::Expression;
 use backend::Backend;
 use query_builder::*;
 use result::QueryResult;
-use super::Expression;
 use sql_types::BigInt;
 
 sql_function! {

diesel/src/expression/count.rs

@@ -1,6 +1,6 @@
 use backend::Backend;
-use expression::{AppearsOnTable, Expression, NonAggregate, SelectableExpression};
 use expression::subselect::Subselect;
+use expression::{AppearsOnTable, Expression, NonAggregate, SelectableExpression};
 use query_builder::*;
 use result::QueryResult;
 use sql_types::Bool;