Add serde support to concrete units

.github/workflows/ci.yml

@@ -37,19 +37,19 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --lib
+          args: --lib --all-features
 
       - name: Test Library
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --lib -- --test-threads=1
+          args: --lib --all-features -- --test-threads=1
 
       - name: Test Documentation
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --doc
+          args: --doc --all-features
 
       - name: Clippy
         uses: actions-rs/cargo@v1
@@ -60,6 +60,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: doc
+          args: --all-features
 
       - name: Build examples
         uses: marcopolo/cargo@master

Cargo.toml

@@ -24,6 +24,7 @@ members = ["examples"]
 
 [dependencies]
 num = { version = "0.3.0", default-features = false }
+serde = { version = "1.0.0", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
 crossbeam-utils = "0.7.2"

README.md

@@ -253,6 +253,10 @@ Hertz::<u64>::try_from(Generic::new(2_000_u32, Fraction::new(1,1_000))) == Ok(He
 - Thorough documentation with examples
 - Example for the nRF52_DK board
 
+## Features
+
+- `serde`: Enables `serde::Deserialize` and `serde::Serialize` implementations for concrete units.
+
 ## Notes
 Some parts of this crate were derived from various sources:
 - [`RTIC`](https://github.com/rtic-rs/cortex-m-rtic)

src/duration.rs

@@ -484,6 +484,7 @@ pub mod units {
         ( $name:ident, ($numer:expr, $denom:expr) ) => {
             /// A duration unit type
             #[derive(Copy, Clone, Eq, Ord, Hash, Debug, Default)]
+            #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
             pub struct $name<T: TimeInt = u32>(pub T);
 
             impl<T: TimeInt> $name<T> {

src/instant.rs

@@ -46,6 +46,7 @@ use num::traits::{WrappingAdd, WrappingSub};
 /// Instant::<SomeClock>::new(23);
 /// ```
 #[derive(Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Instant<Clock: crate::Clock> {
     ticks: Clock::T,
 }
@@ -176,7 +177,7 @@ impl<Clock: crate::Clock> Instant<Clock> {
     pub fn checked_add<Dur: Duration>(self, duration: Dur) -> Option<Self>
     where
         Dur: FixedPoint,
-        Clock::T: TryFrom<Dur::T>,
+        Clock::T: TryFrom<Dur::T> + core::ops::Div<Output = Clock::T>,
     {
         let add_ticks: Clock::T = duration.into_ticks(Clock::SCALING_FACTOR).ok()?;
         if add_ticks <= (<Clock::T as num::Bounded>::max_value() / 2.into()) {
@@ -214,7 +215,7 @@ impl<Clock: crate::Clock> Instant<Clock> {
     pub fn checked_sub<Dur: Duration>(self, duration: Dur) -> Option<Self>
     where
         Dur: FixedPoint,
-        Clock::T: TryFrom<Dur::T>,
+        Clock::T: TryFrom<Dur::T> + core::ops::Div<Output = Clock::T>,
     {
         let sub_ticks: Clock::T = duration.into_ticks(Clock::SCALING_FACTOR).ok()?;
         if sub_ticks <= (<Clock::T as num::Bounded>::max_value() / 2.into()) {
@@ -266,7 +267,11 @@ impl<Clock: crate::Clock> PartialOrd for Instant<Clock> {
     }
 }
 
-impl<Clock: crate::Clock> Ord for Instant<Clock> {
+impl<Clock> Ord for Instant<Clock>
+where
+    Clock: crate::Clock,
+    Clock::T: ops::Div<Output = Clock::T>,
+{
     fn cmp(&self, other: &Self) -> Ordering {
         self.ticks
             .wrapping_sub(&other.ticks)

src/rate.rs

@@ -393,6 +393,7 @@ pub mod units {
         ( $name:ident, ($numer:expr, $denom:expr), $desc:literal ) => {
             #[doc = $desc]
             #[derive(Copy, Clone, Eq, Ord, Hash, Debug, Default)]
+            #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
             pub struct $name<T: TimeInt = u32>(pub T);
 
             impl<T: TimeInt> $name<T> {