Merge pull request #22 from mitchmindtree/serde_update

Update to serde 1.0. Remove serde module in favour of derive. Publish 0.13.0.

Author: mitchmindtree

.travis.yml

@@ -7,5 +7,5 @@ rust:
 script:
     - cargo build --verbose
     - cargo test --verbose
-    - cargo test --features="serde_serialization"
+    - cargo test --features="serde"
     - cargo doc --verbose

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "time_calc"
 description = "A library for music/DSP time conversions! Provides functions and methods for converting between ticks, ms, samples, bars, beats and measures."
-version = "0.12.1"
+version = "0.13.0"
 authors = ["[email protected]"]
 readme = "README.md"
 keywords = ["time", "dsp", "audio", "music", "conversion"]
@@ -12,8 +12,4 @@ homepage = "https://github.com/RustAudio/time_calc"
 [dependencies]
 num = "0.1.28"
 rand = "0.3.12"
-serde = { optional = true, version = "0.7.0" }
-serde_json = { optional = true, version = "0.7.0" }
-
-[features]
-serde_serialization = ["serde", "serde_json"]
+serde = { optional = true, version = "1.0", features = ["serde_derive"] }

src/bars.rs

@@ -28,6 +28,7 @@ use super::{
 
 /// Represents a number of bars aka a simplified version of `Measure(1, Bar, Whole)`.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Bars(pub NumDiv);
 
 impl Bars {

src/beats.rs

@@ -27,6 +27,7 @@ use super::{
 
 /// Represents a number of beats aka a simplified version of `Measure(1, Beat, Whole)`.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Beats(pub NumDiv);
 
 impl Beats {

src/calc.rs

@@ -13,6 +13,7 @@ pub type NumDiv = i64;
 
 /// An enum with variants used to represent a musical division.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Division {
     Bar,
     Minim,
@@ -149,6 +150,7 @@ impl Sub<isize> for Division {
 /// The 'Division Type'. Used for handling 'Thirds'.
 /// Whole represents a Whole division, while TwoThirds represents two thirds of a division.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum DivType {
     Whole,
     TwoThirds,

src/division.rs

@@ -1,5 +1,6 @@
 extern crate num;
 extern crate rand;
+#[cfg(feature = "serde")] #[macro_use] extern crate serde;
 
 pub use bars::Bars;
 pub use beats::Beats;
@@ -42,6 +43,3 @@ pub mod ms;
 pub mod samples;
 pub mod ticks;
 pub mod time_sig;
-
-#[cfg(feature="serde_serialization")]
-mod serde;

src/lib.rs

@@ -31,6 +31,7 @@ use super::{
 /// Measure(3, Beat, Whole) is three beats of musical time.
 /// Measure(1, Minim, TwoThirds) is two thirds of a minim.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Measure(pub NumDiv, pub Division, pub DivType);
 
 impl Measure {

src/measure.rs

@@ -24,6 +24,7 @@ use super::{
 
 /// Time representation in the form of Milliseconds.
 #[derive(Debug, Copy, Clone, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Ms(pub calc::Ms);
 
 impl Ms {

src/ms.rs

@@ -24,6 +24,7 @@ use super::{
 
 /// Time representation in the form of Samples.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Samples(pub calc::Samples);
 
 impl Samples {