Run rustfmt

weiznich · weiznich · commit 2e2ccf377d23 · 2019-11-07T23:22:34.000+01:00
diff --git a/wundergraph/bench/queries.rs b/wundergraph/bench/queries.rs
@@ -74,7 +74,7 @@ const QUERIES: &[&str] = &[
     }
   }
 }"#,
-        r#"query artists_collaboration {
+    r#"query artists_collaboration {
       Artists(filter: {albums: {tracks: {composer: {eq: "Ludwig van Beethoven"}}}})
       {
         artist_id
diff --git a/wundergraph/src/context.rs b/wundergraph/src/context.rs
@@ -2,7 +2,6 @@ use diesel::Connection;
 
 /// A trait for types that could be used as context types for wundergraph
 pub trait WundergraphContext {
-
     /// The underlying connection type
     type Connection: Connection + 'static;
 
diff --git a/wundergraph/src/helper/tuple.rs b/wundergraph/src/helper/tuple.rs
@@ -15,7 +15,6 @@ pub trait IsPrimaryKeyIndex {
 /// let _a: <(i32, &str, f64) as TupleIndex<TupleIndex1>>::Value = "foo";
 /// ```
 pub trait TupleIndex<N> {
-
     /// The type of the indexed tuple value
     type Value;
 
@@ -28,7 +27,6 @@ pub trait TupleIndex<N> {
 /// `Self` represents the existing tuple, `Other` the tuple that should be
 /// appended
 pub trait ConcatTuples<Other> {
-
     /// The resulting tuple type
     type Out;
 }
diff --git a/wundergraph/src/macros/query.rs b/wundergraph/src/macros/query.rs
@@ -32,7 +32,6 @@ macro_rules! __expand_limit {
     };
 }
 
-
 #[doc(hidden)]
 #[macro_export]
 macro_rules! __expand_offset {
diff --git a/wundergraph/src/query_builder/mutations/insert/mod.rs b/wundergraph/src/query_builder/mutations/insert/mod.rs
@@ -103,7 +103,6 @@ pub trait HandleInsert<L, I, DB, Ctx> {
 /// A default implementation is provided for all types implementing
 /// `diesel::Insertable`
 pub trait HandleBatchInsert<L, I, DB, Ctx> {
-
     /// Actual function called to insert a batch of database entity
     fn handle_batch_insert(
         selection: Option<&'_ [Selection<'_, WundergraphScalarValue>]>,
diff --git a/wundergraph/src/query_builder/mutations/insert/pg.rs b/wundergraph/src/query_builder/mutations/insert/pg.rs
@@ -26,11 +26,7 @@ where
     T::FromClause: QueryFragment<Pg>,
     L: LoadingHandler<Pg, Ctx, Table = T> + 'static,
     L::Columns: BuildOrder<T, Pg>
-        + BuildSelect<
-            T,
-            Pg,
-            SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>,
-        >,
+        + BuildSelect<T, Pg, SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>>,
     Ctx: WundergraphContext + QueryModifier<L, Pg>,
     Ctx::Connection: Connection<Backend = Pg>,
     L::FieldList: WundergraphFieldList<Pg, L::PrimaryKeyIndex, T, Ctx>,
@@ -42,9 +38,8 @@ where
         Pg,
         Output = BoxedSelectStatement<'static, SqlTypeOf<<T as Table>::AllColumns>, T, Pg>,
     >,
-    <Ctx::Connection as Connection>::Backend:
-        HasSqlType<SqlTypeOf<T::PrimaryKey>>
-            + HasSqlType<SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>>,
+    <Ctx::Connection as Connection>::Backend: HasSqlType<SqlTypeOf<T::PrimaryKey>>
+        + HasSqlType<SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>>,
     <L::Filter as BuildFilter<Pg>>::Ret: AppearsOnTable<T>,
     T::PrimaryKey: EqAll<Id>,
     &'static L: Identifiable,
@@ -84,11 +79,7 @@ where
     T::FromClause: QueryFragment<Pg>,
     L: LoadingHandler<Pg, Ctx, Table = T> + 'static,
     L::Columns: BuildOrder<T, Pg>
-        + BuildSelect<
-            T,
-            Pg,
-            SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>,
-        >,
+        + BuildSelect<T, Pg, SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>>,
     Ctx: WundergraphContext + QueryModifier<L, Pg>,
     Ctx::Connection: Connection<Backend = Pg>,
     L::FieldList: WundergraphFieldList<Pg, L::PrimaryKeyIndex, T, Ctx>,
@@ -100,9 +91,8 @@ where
         Pg,
         Output = BoxedSelectStatement<'static, SqlTypeOf<<T as Table>::AllColumns>, T, Pg>,
     >,
-    <Ctx::Connection as Connection>::Backend:
-        HasSqlType<SqlTypeOf<T::PrimaryKey>>
-            + HasSqlType<SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>>,
+    <Ctx::Connection as Connection>::Backend: HasSqlType<SqlTypeOf<T::PrimaryKey>>
+        + HasSqlType<SqlTypeOfPlaceholder<L::FieldList, Pg, L::PrimaryKeyIndex, T, Ctx>>,
     <L::Filter as BuildFilter<Pg>>::Ret: AppearsOnTable<T>,
     T::PrimaryKey: EqAll<Id>,
     &'static L: Identifiable,
diff --git a/wundergraph/src/query_builder/mutations/mod.rs b/wundergraph/src/query_builder/mutations/mod.rs
@@ -81,6 +81,6 @@ pub use self::update::HandleUpdate;
 #[doc(hidden)]
 pub use self::delete::handle_delete;
 #[doc(hidden)]
-pub use self::insert::{handle_insert, handle_batch_insert};
+pub use self::insert::{handle_batch_insert, handle_insert};
 #[doc(hidden)]
 pub use self::update::handle_update;
diff --git a/wundergraph/src/query_builder/mutations/update.rs b/wundergraph/src/query_builder/mutations/update.rs
@@ -79,11 +79,7 @@ where
     T::FromClause: QueryFragment<DB>,
     L: LoadingHandler<DB, Ctx, Table = T>,
     L::Columns: BuildOrder<T, DB>
-        + BuildSelect<
-            T,
-            DB,
-            SqlTypeOfPlaceholder<L::FieldList, DB, L::PrimaryKeyIndex, T, Ctx>,
-        >,
+        + BuildSelect<T, DB, SqlTypeOfPlaceholder<L::FieldList, DB, L::PrimaryKeyIndex, T, Ctx>>,
     Ctx: WundergraphContext + QueryModifier<L, DB>,
     Ctx::Connection: Connection<Backend = DB>,
     L::FieldList: WundergraphFieldList<DB, L::PrimaryKeyIndex, T, Ctx>,
diff --git a/wundergraph/src/query_builder/selection/fields/field_list.rs b/wundergraph/src/query_builder/selection/fields/field_list.rs
@@ -1,11 +1,11 @@
 use super::{FieldListExtractor, NonTableFieldExtractor, WundergraphResolveAssociations};
 use crate::context::WundergraphContext;
+use crate::error::Result;
+use crate::helper::tuple::TupleIndex;
+use crate::query_builder::selection::query_resolver::WundergraphResolvePlaceHolderList;
 use crate::query_builder::types::placeholder::PlaceHolderMarker;
 use crate::query_builder::types::WundergraphValue;
-use crate::query_builder::selection::query_resolver::WundergraphResolvePlaceHolderList;
-use crate::helper::tuple::TupleIndex;
 use crate::scalar::WundergraphScalarValue;
-use crate::error::Result;
 use diesel::backend::Backend;
 use diesel::{Connection, Queryable};
 use juniper::{Executor, Selection};
diff --git a/wundergraph/src/query_builder/selection/filter/common_filter/mod.rs b/wundergraph/src/query_builder/selection/filter/common_filter/mod.rs
@@ -3,7 +3,7 @@ use super::collector::{AndCollector, FilterCollector};
 use super::filter_value::FilterValue;
 use super::inner_filter::InnerFilter;
 use crate::diesel_ext::BoxableFilter;
-use crate::juniper_ext::{NameBuilder, Nameable, FromLookAheadValue};
+use crate::juniper_ext::{FromLookAheadValue, NameBuilder, Nameable};
 use crate::scalar::WundergraphScalarValue;
 use diesel::backend::Backend;
 use diesel::expression::array_comparison::{In, Many};
diff --git a/wundergraph/src/query_builder/selection/filter/not.rs b/wundergraph/src/query_builder/selection/filter/not.rs
@@ -1,5 +1,5 @@
 use super::BuildFilter;
-use crate::juniper_ext::{NameBuilder, Nameable, FromLookAheadValue};
+use crate::juniper_ext::{FromLookAheadValue, NameBuilder, Nameable};
 use crate::scalar::WundergraphScalarValue;
 use diesel::backend::Backend;
 use diesel::dsl;
diff --git a/wundergraph/src/query_builder/selection/filter/nullable_filter/filter_option.rs b/wundergraph/src/query_builder/selection/filter/nullable_filter/filter_option.rs
@@ -1,5 +1,5 @@
 use crate::diesel_ext::BoxableFilter;
-use crate::juniper_ext::{NameBuilder, Nameable, FromLookAheadValue};
+use crate::juniper_ext::{FromLookAheadValue, NameBuilder, Nameable};
 use crate::query_builder::selection::filter::build_filter::BuildFilter;
 use crate::query_builder::selection::filter::collector::{AndCollector, FilterCollector};
 use crate::query_builder::selection::filter::filter_value::FilterValue;
diff --git a/wundergraph/src/query_builder/selection/filter/reference_filter.rs b/wundergraph/src/query_builder/selection/filter/reference_filter.rs
@@ -1,5 +1,5 @@
 use crate::diesel_ext::BoxableFilter;
-use crate::juniper_ext::{NameBuilder, Nameable, FromLookAheadValue};
+use crate::juniper_ext::{FromLookAheadValue, NameBuilder, Nameable};
 use crate::query_builder::selection::filter::build_filter::BuildFilter;
 use crate::query_builder::selection::filter::collector::{AndCollector, FilterCollector};
 use crate::query_builder::selection::filter::inner_filter::InnerFilter;
diff --git a/wundergraph/src/query_builder/selection/filter/string_filter/like.rs b/wundergraph/src/query_builder/selection/filter/string_filter/like.rs
@@ -19,7 +19,7 @@ impl<C> Like<C> {
     }
 }
 
-impl<C> Clone for Like<C> where {
+impl<C> Clone for Like<C> {
     fn clone(&self) -> Self {
         Self(self.0.clone(), PhantomData)
     }
diff --git a/wundergraph/src/query_builder/selection/filter/string_filter/mod.rs b/wundergraph/src/query_builder/selection/filter/string_filter/mod.rs
@@ -1,5 +1,5 @@
 use crate::diesel_ext::BoxableFilter;
-use crate::juniper_ext::{NameBuilder, Nameable, FromLookAheadValue};
+use crate::juniper_ext::{FromLookAheadValue, NameBuilder, Nameable};
 use crate::query_builder::selection::filter::build_filter::BuildFilter;
 use crate::query_builder::selection::filter::inner_filter::InnerFilter;
 use crate::scalar::WundergraphScalarValue;
diff --git a/wundergraph/src/query_builder/selection/query_modifier.rs b/wundergraph/src/query_builder/selection/query_modifier.rs
@@ -1,8 +1,8 @@
 use super::{BoxedQuery, LoadingHandler};
 use crate::context::WundergraphContext;
+use crate::error::Result;
 use crate::query_builder::selection::offset::ApplyOffset;
 use crate::scalar::WundergraphScalarValue;
-use crate::error::Result;
 use diesel::backend::Backend;
 use diesel::query_builder::QueryFragment;
 use diesel::{Connection, QuerySource};
diff --git a/wundergraph/src/scalar.rs b/wundergraph/src/scalar.rs
@@ -5,7 +5,9 @@
 //! integers
 
 use juniper::parser::{ParseError, ScalarToken, Token};
-use juniper::{graphql_scalar, InputValue, ParseScalarResult, ScalarValue, Value, GraphQLScalarValue};
+use juniper::{
+    graphql_scalar, GraphQLScalarValue, InputValue, ParseScalarResult, ScalarValue, Value,
+};
 use serde::de;
 use std::fmt;
 
diff --git a/wundergraph/tests/helper.rs b/wundergraph/tests/helper.rs
@@ -12,7 +12,7 @@ use wundergraph::scalar::WundergraphScalarValue;
 use wundergraph_bench::api::{Mutation as BenchMutation, Query as BenchQuery};
 use wundergraph_bench::Schema as BenchSchema;
 use wundergraph_example::mutations::Mutation as ExampleMutation;
-use wundergraph_example::{Query as ExampleQuery, Schema as ExampleSchema, MyContext};
+use wundergraph_example::{MyContext, Query as ExampleQuery, Schema as ExampleSchema};
 
 lazy_static! {
     static ref MIGRATION_LOCK: Mutex<()> = Mutex::new(());
diff --git a/wundergraph/tests/lib.rs b/wundergraph/tests/lib.rs
@@ -12,14 +12,14 @@ extern crate insta;
 
 mod helper;
 
+mod alias;
+mod limit_offset;
+mod mutations;
+mod order;
 mod query;
 mod query_nested;
 mod simple;
-mod order;
-mod limit_offset;
 mod type_checking;
-mod alias;
-mod mutations;
 
 #[cfg(feature = "postgres")]
 type DbConnection = diesel::pg::PgConnection;
diff --git a/wundergraph/tests/mutations/mod.rs b/wundergraph/tests/mutations/mod.rs
@@ -1,4 +1,3 @@
-
 mod create;
-mod update;
 mod delete;
+mod update;
diff --git a/wundergraph_cli/src/database.rs b/wundergraph_cli/src/database.rs
@@ -77,7 +77,8 @@ impl InferConnection {
             }
             #[cfg(feature = "mysql")]
             Backend::Mysql => MysqlConnection::establish(database_url).map(InferConnection::Mysql),
-        }.map_err(Into::into)
+        }
+        .map_err(Into::into)
     }
 }
 
diff --git a/wundergraph_cli/src/infer_schema_internals/information_schema.rs b/wundergraph_cli/src/infer_schema_internals/information_schema.rs
@@ -14,10 +14,8 @@ use super::data_structures::*;
 use super::table_data::TableName;
 
 pub trait UsesInformationSchema: Backend {
-    type TypeColumn: SelectableExpression<
-            self::information_schema::columns::table,
-            SqlType = sql_types::Text,
-        > + NonAggregate
+    type TypeColumn: SelectableExpression<self::information_schema::columns::table, SqlType = sql_types::Text>
+        + NonAggregate
         + QueryId
         + QueryFragment<Self>;
 
diff --git a/wundergraph_cli/src/infer_schema_internals/mysql.rs b/wundergraph_cli/src/infer_schema_internals/mysql.rs
@@ -54,12 +54,14 @@ pub fn load_foreign_key_constraints(
             kcu::table.on(tc::constraint_schema
                 .eq(kcu::constraint_schema)
                 .and(tc::constraint_name.eq(kcu::constraint_name))),
-        ).select((
+        )
+        .select((
             (kcu::table_name, kcu::table_schema),
             (kcu::referenced_table_name, kcu::referenced_table_schema),
             kcu::column_name,
             kcu::referenced_column_name,
-        )).load::<(TableName, TableName, _, _)>(connection)?
+        ))
+        .load::<(TableName, TableName, _, _)>(connection)?
         .into_iter()
         .map(
             |(mut child_table, mut parent_table, foreign_key, primary_key)| {
@@ -72,7 +74,8 @@ pub fn load_foreign_key_constraints(
                     primary_key,
                 }
             },
-        ).collect();
+        )
+        .collect();
     Ok(constraints)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ const QUERIES: &[&str] = &[`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}"#,`
`77`		`- r#"query artists_collaboration {`
	`77`	`+ r#"query artists_collaboration {`
`78`	`78`	`Artists(filter: {albums: {tracks: {composer: {eq: "Ludwig van Beethoven"}}}})`
`79`	`79`	`{`
`80`	`80`	`artist_id`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ macro_rules! __expand_limit {`
`32`	`32`	`};`
`33`	`33`	`}`
`34`	`34`
`35`		`-`
`36`	`35`	`#[doc(hidden)]`
`37`	`36`	`#[macro_export]`
`38`	`37`	`macro_rules! __expand_offset {`