apply requested changes on diesel-rs#2479

Author: ropottnik

.gitignore

@@ -1,5 +1,4 @@
 target
 Cargo.lock
 !diesel_cli/Cargo.lock
-.env
-.DS_Store
+.env

diesel/src/query_builder/mod.rs

@@ -31,9 +31,9 @@ mod select_statement;
 mod sql_query;
 mod update_statement;
 pub(crate) mod upsert;
-pub use self::upsert::on_conflict_target_decorations::DecoratableTarget;
 mod where_clause;
 
+pub use self::upsert::on_conflict_target_decorations::DecoratableTarget;
 pub use self::ast_pass::AstPass;
 pub use self::bind_collector::BindCollector;
 pub use self::debug_query::DebugQuery;

diesel/src/query_builder/upsert/on_conflict_target_decorations.rs

@@ -32,6 +32,7 @@ where
     T: UndecoratedConflictTarget,
 {
     type FilterOutput = DecoratedConflictTarget<T, WhereClause<P>>;
+    
     fn filter_target(self, predicate: P) -> Self::FilterOutput {
         DecoratedConflictTarget {
             target: self,
@@ -47,6 +48,7 @@ where
     U: WhereAnd<P>,
 {
     type FilterOutput = DecoratedConflictTarget<T, <U as WhereAnd<P>>::Output>;
+
     fn filter_target(self, predicate: P) -> Self::FilterOutput {
         DecoratedConflictTarget {
             target: self.target,