Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AUTO : Forward from derives_refactoring to alpha #1366

Merged
merged 14 commits into from
Jun 1, 2024
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -200,22 +200,22 @@ path = "module/core/for_each"
default-features = false

[workspace.dependencies.former]
version = "~2.2.0"
version = "~2.3.0"
path = "module/core/former"
default-features = false

[workspace.dependencies.former_stable]
package = "former"
version = "=2.0.0"
default-features = false
# [workspace.dependencies.former_stable]
# package = "former"
# version = "=2.2.0"
# default-features = false

[workspace.dependencies.former_meta]
version = "~2.2.0"
version = "~2.3.0"
path = "module/core/former_meta"
default-features = false

[workspace.dependencies.former_types]
version = "~2.2.0"
version = "~2.4.0"
path = "module/core/former_types"
default-features = false

Expand Down Expand Up @@ -260,7 +260,7 @@ default-features = false
## macro tools

[workspace.dependencies.macro_tools]
version = "~0.28.0"
version = "~0.30.0"
path = "module/core/macro_tools"
default-features = false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ where 'a : 'b, T : AsRef< U >
}
}

include!( "./only_test/deref.rs" );
include!( "./only_test/basic.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ where
'a : 'b,
T : AsRef< U >;

include!( "./only_test/deref.rs" );
include!( "./only_test/basic.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/bounds_inlined.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ use derive_tools::Deref;
#[ derive( Deref ) ]
struct BoundsInlined< T : ToString, U : Debug >( T, U );

include!( "./only_tests/bounds_inlined.rs" );
include!( "./only_test/bounds_inlined.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ impl< T : ToString, U : Debug > Deref for BoundsInlined< T, U >
}
}

include!( "./only_tests/bounds_inlined.rs" );
include!( "./only_test/bounds_inlined.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/bounds_mixed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ struct BoundsMixed< T : ToString, U >( T, U )
where
U : Debug;

include!( "./only_tests/bounds_mixed.rs" );
include!( "./only_test/bounds_mixed.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ where
}
}

include!( "./only_tests/bounds_mixed.rs" );
include!( "./only_test/bounds_mixed.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/bounds_where.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ where
T : ToString,
for< 'a > U : Trait< 'a >;

include!( "./only_tests/bounds_where.rs" );
include!( "./only_test/bounds_where.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ where
}
}

include!( "./only_tests/bounds_where.rs" );
include!( "./only_test/bounds_where.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/enum_named.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumNamed
B { a : String, b : i32 },
}

include!( "./only_tests/enum_named.rs" );
include!( "./only_test/enum_named.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumNamedEmpty
B {},
}

include!( "./only_tests/enum_named_empty.rs" );
include!( "./only_test/enum_named_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use core::ops::Deref;
#[ allow( dead_code) ]
enum EnumNamedEmpty
{
A {},
A {},
B {},
}

Expand All @@ -16,4 +16,4 @@ impl Deref for EnumNamedEmpty
}
}

include!( "./only_tests/enum_named_empty.rs" );
include!( "./only_test/enum_named_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ impl Deref for EnumNamed
}
}

include!( "./only_tests/enum_named.rs" );
include!( "./only_test/enum_named.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/enum_tuple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumTuple
B( String, i32 ),
}

include!( "./only_tests/enum_tuple.rs" );
include!( "./only_test/enum_tuple.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumTupleEmpty
B(),
}

include!( "./only_tests/enum_tuple_empty.rs" );
include!( "./only_test/enum_tuple_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ impl Deref for EnumTupleEmpty
}
}

include!( "./only_tests/enum_tuple_empty.rs" );
include!( "./only_test/enum_tuple_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ impl Deref for EnumTuple
}
}

include!( "./only_tests/enum_tuple.rs" );
include!( "./only_test/enum_tuple.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/enum_unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumUnit
B,
}

include!( "./only_tests/enum_unit.rs" );
include!( "./only_test/enum_unit.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ impl Deref for EnumUnit
}
}

include!( "./only_tests/enum_unit.rs" );
include!( "./only_test/enum_unit.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive( Deref ) ]
struct GenericsConstants< const N : usize >( i32 );

include!( "./only_tests/generics_constants.rs" );
include!( "./only_test/generics_constants.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive( Deref ) ]
struct GenericsConstantsDefault< const N : usize = 0 >( i32 );

include!( "./only_tests/generics_constants_default.rs" );
include!( "./only_test/generics_constants_default.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl< const N : usize > Deref for GenericsConstantsDefault< N >
}
}

include!( "./only_tests/generics_constants_default.rs" );
include!( "./only_test/generics_constants_default.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl< const N : usize > Deref for GenericsConstants< N >
}
}

include!( "./only_tests/generics_constants.rs" );
include!( "./only_test/generics_constants.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive( Deref ) ]
struct GenericsLifetimes< 'a >( &'a i32 );

include!( "./only_tests/generics_lifetimes.rs" );
include!( "./only_test/generics_lifetimes.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl< 'a > Deref for GenericsLifetimes< 'a >
}
}

include!( "./only_tests/generics_lifetimes.rs" );
include!( "./only_test/generics_lifetimes.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/generics_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive( Deref ) ]
struct GenericsTypes< T >( T );

include!( "./only_tests/generics_types.rs" );
include!( "./only_test/generics_types.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive ( Deref ) ]
struct GenericsTypesDefault< T = i32 >( T );

include!( "./only_tests/generics_types_default.rs" );
include!( "./only_test/generics_types_default.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl< T > Deref for GenericsTypesDefault< T >
}
}

include!( "./only_tests/generics_types_default.rs" );
include!( "./only_test/generics_types_default.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl< T > Deref for GenericsTypes< T >
}
}

include!( "./only_tests/generics_types.rs" );
include!( "./only_test/generics_types.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ struct NameCollisions
b : String,
}

include!( "./only_tests/name_collisions.rs" );
include!( "./only_test/name_collisions.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/struct_named.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ struct StructNamed
b : i32,
}

include!( "./only_tests/struct_named.rs" );
include!( "./only_test/struct_named.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive( Deref ) ]
struct StructNamedEmpty{}

include!( "./only_tests/struct_named_empty.rs" );
include!( "./only_test/struct_named_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl Deref for StructNamedEmpty
}
}

include!( "./only_tests/struct_named_empty.rs" );
include!( "./only_test/struct_named_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ impl Deref for StructNamed
}
}

include!( "./only_tests/struct_named.rs" );
include!( "./only_test/struct_named.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/struct_tuple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive ( Deref ) ]
struct StructTuple( String, i32 );

include!( "./only_tests/struct_tuple.rs" );
include!( "./only_test/struct_tuple.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive ( Deref ) ]
struct StructTupleEmpty();

include!( "./only_tests/struct_tuple_empty.rs" );
include!( "./only_test/struct_tuple_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl Deref for StructTupleEmpty
}
}

include!( "./only_tests/struct_tuple_empty.rs" );
include!( "./only_test/struct_tuple_empty.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl Deref for StructTuple
}
}

include!( "./only_tests/struct_tuple.rs" );
include!( "./only_test/struct_tuple.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref/struct_unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::Deref;
#[ derive ( Deref ) ]
struct StructUnit;

include!( "./only_tests/struct_unit.rs" );
include!( "./only_test/struct_unit.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl Deref for StructUnit
}
}

include!( "./only_tests/struct_unit.rs" );
include!( "./only_test/struct_unit.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ where 'a : 'b, T : AsRef< U >
}
}

include!( "./only_test/deref_mut.rs" );
include!( "./only_test/basic.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ where
'a : 'b,
T : AsRef< U >;

include!( "./only_test/deref_mut.rs" );
include!( "./only_test/basic.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ use derive_tools::{ Deref, DerefMut };
#[ derive( Deref, DerefMut ) ]
struct BoundsInlined< T : ToString, U : Debug >( T, U );

include!( "./only_tests/bounds_inlined.rs" );
include!( "./only_test/bounds_inlined.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ impl< T : ToString, U : Debug > DerefMut for BoundsInlined< T, U >
}
}

include!( "./only_tests/bounds_inlined.rs" );
include!( "./only_test/bounds_inlined.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ struct BoundsMixed< T : ToString, U >( T, U )
where
U : Debug;

include!( "./only_tests/bounds_mixed.rs" );
include!( "./only_test/bounds_mixed.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ where
}


include!( "./only_tests/bounds_mixed.rs" );
include!( "./only_test/bounds_mixed.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ where
T : ToString,
for< 'a > U : Trait< 'a >;

include!( "./only_tests/bounds_where.rs" );
include!( "./only_test/bounds_where.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ where
}
}

include!( "./only_tests/bounds_where.rs" );
include!( "./only_test/bounds_where.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref_mut/enum_named.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumNamed
B { a : String, b : i32 },
}

include!( "./only_tests/enum_named.rs" );
include!( "./only_test/enum_named.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ impl DerefMut for EnumNamed
}
}

include!( "./only_tests/enum_named.rs" );
include!( "./only_test/enum_named.rs" );
2 changes: 1 addition & 1 deletion module/core/derive_tools/tests/inc/deref_mut/enum_tuple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ enum EnumTuple
B( String, i32 ),
}

include!( "./only_tests/enum_tuple.rs" );
include!( "./only_test/enum_tuple.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ impl DerefMut for EnumTuple
}
}

include!( "./only_tests/enum_tuple.rs" );
include!( "./only_test/enum_tuple.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::{ Deref, DerefMut };
#[ derive( Deref, DerefMut ) ]
struct GenericsConstants< const N : usize >( i32 );

include!( "./only_tests/generics_constants.rs" );
include!( "./only_test/generics_constants.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::{ Deref, DerefMut };
#[ derive( Deref, DerefMut ) ]
struct GenericsConstantsDefault< const N : usize = 0 >( i32 );

include!( "./only_tests/generics_constants_default.rs" );
include!( "./only_test/generics_constants_default.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ impl< const N : usize > DerefMut for GenericsConstantsDefault< N >
}
}

include!( "./only_tests/generics_constants_default.rs" );
include!( "./only_test/generics_constants_default.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ impl< const N : usize > DerefMut for GenericsConstants< N >
}
}

include!( "./only_tests/generics_constants.rs" );
include!( "./only_test/generics_constants.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::{ Deref, DerefMut };
#[ derive( Deref, DerefMut ) ]
struct GenericsLifetimes< 'a >( &'a i32 );

include!( "./only_tests/generics_lifetimes.rs" );
include!( "./only_test/generics_lifetimes.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ impl< 'a > DerefMut for GenericsLifetimes< 'a >
}
}

include!( "./only_tests/generics_lifetimes.rs" );
include!( "./only_test/generics_lifetimes.rs" );
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ use derive_tools::{ Deref, DerefMut };
#[ derive( Deref, DerefMut ) ]
struct GenericsTypes< T >( T );

include!( "./only_tests/generics_types.rs" );
include!( "./only_test/generics_types.rs" );
Loading
Loading