Amount, Instant and Id now impl Default for relevant TraitFlags

Author: peter-lyons-kehl

src/amount.rs

@@ -152,6 +152,7 @@ pub struct Amount<const TF: TraitFlags, Unit, Repr>(
 );
 
 impl<const TF: TraitFlags, Unit, Repr: Copy> Amount<TF, Unit, Repr> {
+    // @TODO
     /// Returns the wrapped value.
     ///
     /// ```
@@ -176,7 +177,7 @@ impl<const TF: TraitFlags, Unit, Repr> Amount<TF, Unit, Repr> {
     }
 }
 
-impl<const TF: TraitFlags, Unit: Default, Repr: Copy> Amount<TF, Unit, Repr> {
+impl<const TF: TraitFlags, Unit: Default, Repr> Amount<TF, Unit, Repr> {
     // @TODO similar but without &self
     //
     /// Provides a useful shortcut to access units of an amount if
@@ -223,7 +224,7 @@ where
     }
 }
 
-impl<const TF: TraitFlags, Unit, Repr: Copy> From<Repr> for Amount<TF, Unit, Repr> {
+impl<const TF: TraitFlags, Unit, Repr> From<Repr> for Amount<TF, Unit, Repr> {
     fn from(repr: Repr) -> Self {
         Self::new(repr)
     }
@@ -235,15 +236,30 @@ impl<const TF: TraitFlags, Unit, Repr: Copy> From<Repr> for Amount<TF, Unit, Rep
 // `PartialEq<Wrapper<T>>` require `T` to implement `PartialEq`, which
 // is not what we want: `T` is phantom in our case.
 
-impl<const TF: TraitFlags, Unit, Repr: Copy> Clone for Amount<TF, Unit, Repr> {
+impl<const TF: TraitFlags, Unit, Repr: Clone> Clone for Amount<TF, Unit, Repr> {
     fn clone(&self) -> Self {
-        Amount(self.0, PhantomData)
+        Amount(self.0.clone(), PhantomData)
     }
 }
 
 impl<Unit, Repr: Copy> Copy for Amount<{ trait_flag::TRAIT_FLAGS_IS_COPY_IS_DEFAULT }, Unit, Repr> {}
 impl<Unit, Repr: Copy> Copy for Amount<{ trait_flag::TRAIT_FLAGS_IS_COPY_NO_DEFAULT }, Unit, Repr> {}
 
+impl<Unit, Repr: Default> Default
+    for Amount<{ trait_flag::TRAIT_FLAGS_IS_COPY_IS_DEFAULT }, Unit, Repr>
+{
+    fn default() -> Self {
+        Self(Default::default(), PhantomData)
+    }
+}
+impl<Unit, Repr: Default> Default
+    for Amount<{ trait_flag::TRAIT_FLAGS_NO_COPY_IS_DEFAULT }, Unit, Repr>
+{
+    fn default() -> Self {
+        Self(Default::default(), PhantomData)
+    }
+}
+
 impl<const TF: TraitFlags, Unit, Repr: PartialEq> PartialEq for Amount<TF, Unit, Repr> {
     fn eq(&self, rhs: &Self) -> bool {
         self.0.eq(&rhs.0)

src/id.rs

@@ -217,6 +217,21 @@ impl<const TF: TraitFlags, Entity, Repr: Clone> Clone for Id<TF, Entity, Repr> {
 impl<Entity, Repr: Copy> Copy for Id<{ trait_flag::TRAIT_FLAGS_IS_COPY_IS_DEFAULT }, Entity, Repr> {}
 impl<Entity, Repr: Copy> Copy for Id<{ trait_flag::TRAIT_FLAGS_IS_COPY_NO_DEFAULT }, Entity, Repr> {}
 
+impl<Unit, Repr: Default> Default
+    for Id<{ trait_flag::TRAIT_FLAGS_IS_COPY_IS_DEFAULT }, Unit, Repr>
+{
+    fn default() -> Self {
+        Self(Default::default(), PhantomData)
+    }
+}
+impl<Unit, Repr: Default> Default
+    for Id<{ trait_flag::TRAIT_FLAGS_NO_COPY_IS_DEFAULT }, Unit, Repr>
+{
+    fn default() -> Self {
+        Self(Default::default(), PhantomData)
+    }
+}
+
 impl<const TF: TraitFlags, Entity, Repr: PartialEq> PartialEq for Id<TF, Entity, Repr> {
     fn eq(&self, rhs: &Self) -> bool {
         self.get().eq(&rhs.get())

src/instant.rs

@@ -148,6 +148,8 @@ pub struct Instant<const TF: TraitFlags, Unit, Repr>(
 );
 //type TT<X>= core::sync::Exclusive<>
 impl<const TF: TraitFlags, Unit, Repr: Copy> Instant<TF, Unit, Repr> {
+    // @TODO
+
     /// Returns the wrapped value.
     ///
     /// ```
@@ -172,7 +174,7 @@ impl<const TF: TraitFlags, Unit, Repr> Instant<TF, Unit, Repr> {
     }
 }
 
-impl<const TF: TraitFlags, Unit: Default, Repr: Copy> Instant<TF, Unit, Repr> {
+impl<const TF: TraitFlags, Unit: Default, Repr> Instant<TF, Unit, Repr> {
     /// Provides a useful shortcut to access units of an instant if
     /// they implement the `Default` trait:
     ///
@@ -217,15 +219,15 @@ where
     }
 }
 
-impl<const TF: TraitFlags, Unit, Repr: Copy> From<Repr> for Instant<TF, Unit, Repr> {
+impl<const TF: TraitFlags, Unit, Repr> From<Repr> for Instant<TF, Unit, Repr> {
     fn from(repr: Repr) -> Self {
         Self::new(repr)
     }
 }
 
-impl<const TF: TraitFlags, Unit, Repr: Copy> Clone for Instant<TF, Unit, Repr> {
+impl<const TF: TraitFlags, Unit, Repr: Clone> Clone for Instant<TF, Unit, Repr> {
     fn clone(&self) -> Self {
-        Instant(self.0, PhantomData)
+        Instant(self.0.clone(), PhantomData)
     }
 }
 
@@ -238,6 +240,21 @@ impl<Unit, Repr: Copy> Copy
 {
 }
 
+impl<Unit, Repr: Default> Default
+    for Instant<{ trait_flag::TRAIT_FLAGS_IS_COPY_IS_DEFAULT }, Unit, Repr>
+{
+    fn default() -> Self {
+        Self(Default::default(), PhantomData)
+    }
+}
+impl<Unit, Repr: Default> Default
+    for Instant<{ trait_flag::TRAIT_FLAGS_NO_COPY_IS_DEFAULT }, Unit, Repr>
+{
+    fn default() -> Self {
+        Self(Default::default(), PhantomData)
+    }
+}
+
 impl<const TF: TraitFlags, Unit, Repr: PartialEq> PartialEq for Instant<TF, Unit, Repr> {
     fn eq(&self, rhs: &Self) -> bool {
         self.0.eq(&rhs.0)