Merge pull request #1370 from YBoy-git/fix_deref_tests

READY : (derive_tools) : Fix deref_mut tests

module/core/derive_tools/tests/inc/deref_mut/bounds_inlined.rs

@@ -1,10 +1,19 @@
 use core::fmt::Debug;
 
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct BoundsInlined< T : ToString, U : Debug >( T, U );
 
+impl< T : ToString, U : Debug > Deref for BoundsInlined< T, U >
+{
+  type Target = T;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/bounds_inlined.rs" );

module/core/derive_tools/tests/inc/deref_mut/bounds_mixed.rs

@@ -1,12 +1,23 @@
 use core::fmt::Debug;
 
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct BoundsMixed< T : ToString, U >( T, U )
 where
   U : Debug;
 
+impl< T : ToString, U > Deref for BoundsMixed< T, U >
+where
+  U : Debug,
+{
+  type Target = T;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/bounds_mixed.rs" );

module/core/derive_tools/tests/inc/deref_mut/bounds_where.rs

@@ -1,14 +1,26 @@
 trait Trait<'a> {}
 impl<'a> Trait<'a> for i32 {}
 
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct BoundsWhere< T, U >( T, U )
 where
   T : ToString,
   for< 'a > U : Trait< 'a >;
 
+impl< T, U > Deref for BoundsWhere< T, U >
+where
+  T : ToString,
+  for< 'a > U : Trait< 'a >
+{
+  type Target = T;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/bounds_where.rs" );

module/core/derive_tools/tests/inc/deref_mut/enum_named.rs

@@ -1,12 +1,24 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 enum EnumNamed
 {
   A { a : String, b : i32 },
   B { a : String, b : i32 },
 }
 
+impl Deref for EnumNamed
+{
+  type Target = String;
+  fn deref( &self ) -> &Self::Target
+  {
+    match self
+    {
+      Self::A { a : v, ..} | Self::B { a : v, .. } => v
+    }
+  }
+}
+
 include!( "./only_test/enum_named.rs" );

module/core/derive_tools/tests/inc/deref_mut/enum_tuple.rs

@@ -1,12 +1,24 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 enum EnumTuple
 {
   A( String, i32 ),
   B( String, i32 ),
 }
 
+impl Deref for EnumTuple
+{
+  type Target = String;
+  fn deref( &self ) -> &Self::Target
+  {
+    match self
+    {
+      Self::A( v, .. ) | Self::B( v, .. ) => v
+    }
+  }
+}
+
 include!( "./only_test/enum_tuple.rs" );

module/core/derive_tools/tests/inc/deref_mut/generics_constants.rs

@@ -1,8 +1,17 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::{ DerefMut };
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct GenericsConstants< const N : usize >( i32 );
 
+impl< const N : usize > Deref for GenericsConstants< N >
+{
+  type Target = i32;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/generics_constants.rs" );

module/core/derive_tools/tests/inc/deref_mut/generics_constants_default.rs

@@ -1,8 +1,17 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct GenericsConstantsDefault< const N : usize = 0 >( i32 );
 
+impl< const N : usize > Deref for GenericsConstantsDefault< N >
+{
+  type Target = i32;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/generics_constants_default.rs" );

module/core/derive_tools/tests/inc/deref_mut/generics_lifetimes.rs

@@ -1,8 +1,17 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct GenericsLifetimes< 'a >( &'a i32 );
 
+impl< 'a > Deref for GenericsLifetimes< 'a >
+{
+  type Target = &'a i32;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/generics_lifetimes.rs" );

module/core/derive_tools/tests/inc/deref_mut/generics_types.rs

@@ -1,8 +1,17 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct GenericsTypes< T >( T );
 
+impl< T > Deref for GenericsTypes< T >
+{
+  type Target = T;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/generics_types.rs" );

module/core/derive_tools/tests/inc/deref_mut/generics_types_default.rs

@@ -1,8 +1,17 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive ( Deref, DerefMut ) ]
+#[ derive ( DerefMut ) ]
 struct GenericsTypesDefault< T = i32 >( T );
 
+impl< T > Deref for GenericsTypesDefault< T >
+{
+  type Target = T;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/generics_types_default.rs" );

module/core/derive_tools/tests/inc/deref_mut/name_collisions.rs

@@ -2,7 +2,7 @@
 #![ allow( unused_imports ) ]
 
 use ::core::ops::Deref;
-use derive_tools::{ Deref, DerefMut };
+use derive_tools::{ DerefMut };
 
 pub mod core {}
 pub mod std {}
@@ -13,11 +13,20 @@ pub mod FromPair {}
 pub mod FromBin {}
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct NameCollisions
 {
   a : i32,
   b : String,
 }
 
+impl Deref for NameCollisions
+{
+  type Target = i32;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.a
+  }
+}
+
 include!( "./only_test/name_collisions.rs" );

module/core/derive_tools/tests/inc/deref_mut/struct_named.rs

@@ -1,12 +1,21 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive( Deref, DerefMut ) ]
+#[ derive( DerefMut ) ]
 struct StructNamed
 {
   a : String,
   b : i32,
 }
 
+impl Deref for StructNamed
+{
+  type Target = String;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.a
+  }
+}
+
 include!( "./only_test/struct_named.rs" );

module/core/derive_tools/tests/inc/deref_mut/struct_tuple.rs

@@ -1,8 +1,17 @@
-use core::ops::{ Deref };
-use derive_tools::{ Deref, DerefMut };
+use core::ops::Deref;
+use derive_tools::DerefMut;
 
 #[ allow( dead_code ) ]
-#[ derive ( Deref, DerefMut ) ]
+#[ derive ( DerefMut ) ]
 struct StructTuple( String, i32 );
 
+impl Deref for StructTuple
+{
+  type Target = String;
+  fn deref( &self ) -> &Self::Target
+  {
+    &self.0
+  }
+}
+
 include!( "./only_test/struct_tuple.rs" );