Run cargo fix --edition take 2

Author: weiznich

wundergraph/src/filter/build_filter.rs

@@ -18,7 +18,7 @@ where
 }
 
 impl<'a, T, DB> BuildFilter<DB>
-    for Box<BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>
+    for Box<dyn BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>
 where
     DB: Backend,
 {

wundergraph/src/filter/collector/and.rs

@@ -10,15 +10,15 @@ use std::fmt::{self, Debug};
 
 /// A filter collected that combines all given filters using `AND`
 pub struct AndCollector<'a, T, DB>(
-    Option<Box<BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>>,
+    Option<Box<dyn BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>>,
 );
 
 impl<'a, T, DB> Debug for AndCollector<'a, T, DB>
 where
     DB: Backend,
     DB::QueryBuilder: Default,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_tuple("AndCollector")
             .field(&self.0.as_ref().map(|q| ::diesel::debug_query(q)))
             .finish()
@@ -56,7 +56,7 @@ impl<'a, T, DB> BuildFilter<DB> for AndCollector<'a, T, DB>
 where
     DB: Backend,
 {
-    type Ret = Box<BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>;
+    type Ret = Box<dyn BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>;
 
     fn into_filter(self) -> Option<Self::Ret> {
         self.0

wundergraph/src/filter/collector/or.rs

@@ -10,15 +10,15 @@ use std::fmt::{self, Debug};
 
 /// A filter collected that combines all given filters using `or`
 pub struct OrCollector<'a, T, DB>(
-    Option<Box<BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>>,
+    Option<Box<dyn BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>>,
 );
 
 impl<'a, T, DB> Debug for OrCollector<'a, T, DB>
 where
     DB: Backend,
     DB::QueryBuilder: Default,
 {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_tuple("OrCollector")
             .field(&self.0.as_ref().map(|q| ::diesel::debug_query(q)))
             .finish()
@@ -56,7 +56,7 @@ impl<'a, T, DB> BuildFilter<DB> for OrCollector<'a, T, DB>
 where
     DB: Backend,
 {
-    type Ret = Box<BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>;
+    type Ret = Box<dyn BoxableFilter<T, DB, SqlType = ::diesel::sql_types::Bool> + 'a>;
 
     fn into_filter(self) -> Option<Self::Ret> {
         self.0

wundergraph/src/filter/common_filter/eq.rs

@@ -41,7 +41,7 @@ where
     operators::Eq<C, <T as AsExpression<C::SqlType>>::Expression>:
         AppearsOnTable<C::Table, SqlType = Bool>,
 {
-    type Ret = Box<BoxableFilter<C::Table, DB, SqlType = Bool>>;
+    type Ret = Box<dyn BoxableFilter<C::Table, DB, SqlType = Bool>>;
 
     fn into_filter(self) -> Option<Self::Ret> {
         let Eq(filter, _) = self;

wundergraph/src/filter/common_filter/eq_any.rs

@@ -42,7 +42,7 @@ where
     In<C, Many<<T as AsExpression<C::SqlType>>::Expression>>:
         AppearsOnTable<C::Table, SqlType = Bool>,
 {
-    type Ret = Box<BoxableFilter<C::Table, DB, SqlType = Bool>>;
+    type Ret = Box<dyn BoxableFilter<C::Table, DB, SqlType = Bool>>;
 
     fn into_filter(self) -> Option<Self::Ret> {
         let EqAny(filter, _) = self;

wundergraph/src/filter/common_filter/mod.rs

@@ -102,7 +102,7 @@ where
         })
     }
 
-    fn from_inner_look_ahead(obj: &[(&str, LookAheadValue<WundergraphScalarValue>)]) -> Self {
+    fn from_inner_look_ahead(obj: &[(&str, LookAheadValue<'_, WundergraphScalarValue>)]) -> Self {
         let eq = obj
             .iter()
             .find(|o| o.0 == "eq")
@@ -221,7 +221,7 @@ where
     C: Column,
     Self: InnerFilter,
 {
-    fn from_look_ahead(a: &LookAheadValue<WundergraphScalarValue>) -> Option<Self> {
+    fn from_look_ahead(a: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Object(ref obj) = *a {
             Some(Self::from_inner_look_ahead(obj))
         } else {
@@ -250,7 +250,7 @@ where
     In<C, Many<<T::RawValue as AsExpression<C::SqlType>>::Expression>>:
         AppearsOnTable<C::Table, SqlType = Bool>,
 {
-    type Ret = Box<BoxableFilter<C::Table, DB, SqlType = Bool>>;
+    type Ret = Box<dyn BoxableFilter<C::Table, DB, SqlType = Bool>>;
 
     fn into_filter(self) -> Option<Self::Ret> {
         let mut combinator = AndCollector::default();

wundergraph/src/filter/common_filter/not_eq.rs

@@ -41,7 +41,7 @@ where
     operators::NotEq<C, <T as AsExpression<C::SqlType>>::Expression>:
         AppearsOnTable<C::Table, SqlType = Bool>,
 {
-    type Ret = Box<BoxableFilter<C::Table, DB, SqlType = Bool>>;
+    type Ret = Box<dyn BoxableFilter<C::Table, DB, SqlType = Bool>>;
 
     fn into_filter(self) -> Option<Self::Ret> {
         let NotEq(filter, _) = self;

wundergraph/src/filter/filter_helper.rs

@@ -153,7 +153,7 @@ macro_rules! __impl_build_filter_for_tuples {
                 Back::QueryBuilder: Default,
 
             {
-                type Ret = Box<BoxableFilter<Loading::Table, Back, SqlType = Bool>>;
+                type Ret = Box<dyn BoxableFilter<Loading::Table, Back, SqlType = Bool>>;
 
                 fn into_filter(self) -> Option<Self::Ret> {
                     use crate::filter::collector::{AndCollector, FilterCollector};
@@ -200,7 +200,7 @@ macro_rules! __impl_build_filter_for_tuples {
                 }
 
                 fn from_inner_look_ahead(
-                    objs: &[(&str, LookAheadValue<WundergraphScalarValue>)]
+                    objs: &[(&str, LookAheadValue<'_, WundergraphScalarValue>)]
                 ) -> Self {
                     use crate::query_helper::placeholder::WundergraphFieldList;
                     let mut values = ($(Option::<$T>::None,)*);

wundergraph/src/filter/inner_filter.rs

@@ -21,7 +21,7 @@ pub trait InnerFilter: Sized + Nameable {
         v: IndexMap<&str, &InputValue<WundergraphScalarValue>>,
     ) -> Option<Self>;
     /// Create the given filter from a graphql lookahead value
-    fn from_inner_look_ahead(v: &[(&str, LookAheadValue<WundergraphScalarValue>)]) -> Self;
+    fn from_inner_look_ahead(v: &[(&str, LookAheadValue<'_, WundergraphScalarValue>)]) -> Self;
     /// Covert the given filter into a graphql value
     fn to_inner_input_value(&self, v: &mut IndexMap<&str, InputValue<WundergraphScalarValue>>);
     /// Register all fields of the the filter in a given graphql schema
@@ -42,7 +42,7 @@ impl InnerFilter for () {
     ) -> Option<Self> {
         Some(())
     }
-    fn from_inner_look_ahead(_v: &[(&str, LookAheadValue<WundergraphScalarValue>)]) -> Self {
+    fn from_inner_look_ahead(_v: &[(&str, LookAheadValue<'_, WundergraphScalarValue>)]) -> Self {
         ()
     }
     fn to_inner_input_value(&self, _v: &mut IndexMap<&str, InputValue<WundergraphScalarValue>>) {}

wundergraph/src/filter/mod.rs

@@ -154,7 +154,7 @@ impl<F, T> FromLookAheadValue for Filter<F, T>
 where
     F: InnerFilter,
 {
-    fn from_look_ahead(v: &LookAheadValue<WundergraphScalarValue>) -> Option<Self> {
+    fn from_look_ahead(v: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Object(ref obj) = *v {
             Some(Self::from_inner_look_ahead(obj))
         } else {
@@ -218,7 +218,7 @@ where
         <Self as BuildFilter<DB>>::Ret: AppearsOnTable<T> + QueryFragment<DB> + 'a,
     {
         if let Some(f) = self.into_filter() {
-            q = <BoxedSelectStatement<_, _, _> as QueryDsl>::filter(q, f);
+            q = <BoxedSelectStatement<'_, _, _, _> as QueryDsl>::filter(q, f);
         }
         q
     }
@@ -257,7 +257,7 @@ where
         })
     }
 
-    fn from_inner_look_ahead(objs: &[(&str, LookAheadValue<WundergraphScalarValue>)]) -> Self {
+    fn from_inner_look_ahead(objs: &[(&str, LookAheadValue<'_, WundergraphScalarValue>)]) -> Self {
         let and = objs
             .iter()
             .find(|o| o.0 == "and")