Run cargo fix --edition take 1

Author: weiznich

wundergraph/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 authors = ["Georg Semmler <[email protected]>"]
 license = "MIT OR Apache-2.0"
 autotests = false
+edition = "2018"
 
 [dependencies]
 serde = "1"

wundergraph/src/filter/build_filter.rs

@@ -2,7 +2,7 @@ use diesel::backend::Backend;
 use diesel::expression::{Expression, NonAggregate, SqlLiteral};
 use diesel::query_builder::QueryFragment;
 use diesel::sql_types::Bool;
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 /// A trait that indicates that some type could be converted into a sql filter
 /// operation.

wundergraph/src/filter/collector/and.rs

@@ -1,10 +1,10 @@
 use super::FilterCollector;
-use filter::build_filter::BuildFilter;
+use crate::filter::build_filter::BuildFilter;
 
 use diesel::backend::Backend;
 use diesel::query_builder::QueryFragment;
 use diesel::{AppearsOnTable, BoolExpressionMethods};
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 use std::fmt::{self, Debug};
 

wundergraph/src/filter/collector/mod.rs

@@ -1,7 +1,7 @@
 //! This module contains helper types to combine multiple filter expressions
 //! into a final expression
 
-use filter::build_filter::BuildFilter;
+use crate::filter::build_filter::BuildFilter;
 
 use diesel::backend::Backend;
 use diesel::query_builder::QueryFragment;

wundergraph/src/filter/collector/or.rs

@@ -1,10 +1,10 @@
 use super::FilterCollector;
-use filter::build_filter::BuildFilter;
+use crate::filter::build_filter::BuildFilter;
 
 use diesel::backend::Backend;
 use diesel::query_builder::QueryFragment;
 use diesel::{AppearsOnTable, BoolExpressionMethods};
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 use std::fmt::{self, Debug};
 

wundergraph/src/filter/common_filter/eq.rs

@@ -1,15 +1,15 @@
 use std::marker::PhantomData;
 
-use filter::build_filter::BuildFilter;
-use scalar::WundergraphScalarValue;
+use crate::filter::build_filter::BuildFilter;
+use crate::scalar::WundergraphScalarValue;
 
 use diesel::backend::Backend;
 use diesel::expression::{operators, AsExpression, Expression, NonAggregate};
 use diesel::query_builder::QueryFragment;
 use diesel::serialize::ToSql;
 use diesel::sql_types::{Bool, HasSqlType};
 use diesel::{AppearsOnTable, Column, ExpressionMethods};
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 use juniper::{InputValue, ToInputValue};
 

wundergraph/src/filter/common_filter/eq_any.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
-use filter::build_filter::BuildFilter;
-use scalar::WundergraphScalarValue;
+use crate::filter::build_filter::BuildFilter;
+use crate::scalar::WundergraphScalarValue;
 
 use diesel::backend::Backend;
 use diesel::expression::array_comparison::{In, Many};
@@ -10,7 +10,7 @@ use diesel::query_builder::QueryFragment;
 use diesel::serialize::ToSql;
 use diesel::sql_types::{Bool, HasSqlType};
 use diesel::{AppearsOnTable, Column, ExpressionMethods};
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 use juniper::{InputValue, ToInputValue};
 

wundergraph/src/filter/common_filter/mod.rs

@@ -1,7 +1,7 @@
-use filter::build_filter::BuildFilter;
-use filter::collector::{AndCollector, FilterCollector};
-use filter::filter_value::FilterValue;
-use filter::inner_filter::InnerFilter;
+use crate::filter::build_filter::BuildFilter;
+use crate::filter::collector::{AndCollector, FilterCollector};
+use crate::filter::filter_value::FilterValue;
+use crate::filter::inner_filter::InnerFilter;
 
 use diesel::backend::Backend;
 use diesel::expression::array_comparison::{In, Many};
@@ -10,14 +10,14 @@ use diesel::query_builder::QueryFragment;
 use diesel::serialize::ToSql;
 use diesel::sql_types::{Bool, HasSqlType, SingleValue};
 use diesel::Column;
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 use juniper::meta::{Argument, MetaType};
 use juniper::{FromInputValue, GraphQLType, InputValue, LookAheadValue, Registry, ToInputValue};
 
-use helper::{FromLookAheadValue, NameBuilder, Nameable};
+use crate::helper::{FromLookAheadValue, NameBuilder, Nameable};
 use indexmap::IndexMap;
-use scalar::WundergraphScalarValue;
+use crate::scalar::WundergraphScalarValue;
 
 mod eq;
 mod eq_any;

wundergraph/src/filter/common_filter/not_eq.rs

@@ -1,15 +1,15 @@
 use std::marker::PhantomData;
 
-use filter::build_filter::BuildFilter;
-use scalar::WundergraphScalarValue;
+use crate::filter::build_filter::BuildFilter;
+use crate::scalar::WundergraphScalarValue;
 
 use diesel::backend::Backend;
 use diesel::expression::{operators, AsExpression, Expression, NonAggregate};
 use diesel::query_builder::QueryFragment;
 use diesel::serialize::ToSql;
 use diesel::sql_types::{Bool, HasSqlType};
 use diesel::{AppearsOnTable, Column, ExpressionMethods};
-use diesel_ext::BoxableFilter;
+use crate::diesel_ext::BoxableFilter;
 
 use juniper::{InputValue, ToInputValue};
 

wundergraph/src/filter/filter_helper.rs

@@ -5,23 +5,23 @@ use diesel::AppearsOnTable;
 use diesel::Column;
 use diesel::QuerySource;
 use diesel::Table;
-use diesel_ext::BoxableFilter;
-use filter::build_filter::BuildFilter;
-use filter::common_filter::FilterOption;
-use filter::filter_value::FilterValue;
-use filter::inner_filter::InnerFilter;
-use filter::nullable_filter::NullableReferenceFilter;
-use filter::reference_filter::ReferenceFilter;
-use filter::Filter;
-use helper::{FromLookAheadValue, NameBuilder, Nameable};
+use crate::diesel_ext::BoxableFilter;
+use crate::filter::build_filter::BuildFilter;
+use crate::filter::common_filter::FilterOption;
+use crate::filter::filter_value::FilterValue;
+use crate::filter::inner_filter::InnerFilter;
+use crate::filter::nullable_filter::NullableReferenceFilter;
+use crate::filter::reference_filter::ReferenceFilter;
+use crate::filter::Filter;
+use crate::helper::{FromLookAheadValue, NameBuilder, Nameable};
 use indexmap::IndexMap;
 use juniper::meta::Argument;
 use juniper::{FromInputValue, GraphQLType, InputValue, LookAheadValue, Registry, ToInputValue};
-use query_helper::placeholder::WundergraphBelongsTo;
-use query_helper::{HasMany, HasOne};
-use scalar::WundergraphScalarValue;
+use crate::query_helper::placeholder::WundergraphBelongsTo;
+use crate::query_helper::{HasMany, HasOne};
+use crate::scalar::WundergraphScalarValue;
 use std::marker::PhantomData;
-use LoadingHandler;
+use crate::LoadingHandler;
 
 
 #[derive(Debug, Clone)]
@@ -156,7 +156,7 @@ macro_rules! __impl_build_filter_for_tuples {
                 type Ret = Box<BoxableFilter<Loading::Table, Back, SqlType = Bool>>;
 
                 fn into_filter(self) -> Option<Self::Ret> {
-                    use filter::collector::{AndCollector, FilterCollector};
+                    use crate::filter::collector::{AndCollector, FilterCollector};
 
                     let mut and = AndCollector::<_, Back>::default();
                     $(
@@ -202,7 +202,7 @@ macro_rules! __impl_build_filter_for_tuples {
                 fn from_inner_look_ahead(
                     objs: &[(&str, LookAheadValue<WundergraphScalarValue>)]
                 ) -> Self {
-                    use query_helper::placeholder::WundergraphFieldList;
+                    use crate::query_helper::placeholder::WundergraphFieldList;
                     let mut values = ($(Option::<$T>::None,)*);
                     for (name, value) in objs {
                         match name {
@@ -228,7 +228,7 @@ macro_rules! __impl_build_filter_for_tuples {
                     _info: &NameBuilder<Self>,
                     registry: &mut Registry<'r, WundergraphScalarValue>,
                 ) -> Vec<Argument<'r, WundergraphScalarValue>> {
-                    use query_helper::placeholder::WundergraphFieldList;
+                    use crate::query_helper::placeholder::WundergraphFieldList;
                     vec![
                         $(
                             registry.arg_with_default::<Option<$T>>(