Merge pull request #21 from mitchmindtree/master

Add assignment operator impls. Publish 0.12.1.

Author: mitchmindtree

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.0"
+version = "0.12.1"
 authors = ["[email protected]"]
 readme = "README.md"
 keywords = ["time", "dsp", "audio", "music", "conversion"]

src/bars.rs

@@ -6,7 +6,8 @@
 //!
 
 use num::{FromPrimitive, ToPrimitive};
-use std::ops::{Add, Sub, Mul, Div, Rem, Neg};
+use std::ops::{Add, Sub, Mul, Div, Rem, Neg,
+               AddAssign, SubAssign, MulAssign, DivAssign, RemAssign};
 use super::calc;
 use super::{
     Bpm,
@@ -132,6 +133,36 @@ impl Neg for Bars {
     }
 }
 
+impl AddAssign for Bars {
+    fn add_assign(&mut self, rhs: Bars) {
+        *self = *self + rhs;
+    }
+}
+
+impl SubAssign for Bars {
+    fn sub_assign(&mut self, rhs: Bars) {
+        *self = *self - rhs;
+    }
+}
+
+impl MulAssign for Bars {
+    fn mul_assign(&mut self, rhs: Bars) {
+        *self = *self * rhs;
+    }
+}
+
+impl DivAssign for Bars {
+    fn div_assign(&mut self, rhs: Bars) {
+        *self = *self / rhs;
+    }
+}
+
+impl RemAssign for Bars {
+    fn rem_assign(&mut self, rhs: Bars) {
+        *self = *self % rhs;
+    }
+}
+
 impl ToPrimitive for Bars {
     fn to_u64(&self) -> Option<u64> {
         self.bars().to_u64()

src/beats.rs

@@ -6,7 +6,8 @@
 //!
 
 use num::{FromPrimitive, ToPrimitive};
-use std::ops::{Add, Sub, Mul, Div, Rem, Neg};
+use std::ops::{Add, Sub, Mul, Div, Rem, Neg,
+               AddAssign, SubAssign, MulAssign, DivAssign, RemAssign};
 use super::calc;
 use super::{
     Bpm,
@@ -132,6 +133,36 @@ impl Neg for Beats {
     }
 }
 
+impl AddAssign for Beats {
+    fn add_assign(&mut self, rhs: Beats) {
+        *self = *self + rhs;
+    }
+}
+
+impl SubAssign for Beats {
+    fn sub_assign(&mut self, rhs: Beats) {
+        *self = *self - rhs;
+    }
+}
+
+impl MulAssign for Beats {
+    fn mul_assign(&mut self, rhs: Beats) {
+        *self = *self * rhs;
+    }
+}
+
+impl DivAssign for Beats {
+    fn div_assign(&mut self, rhs: Beats) {
+        *self = *self / rhs;
+    }
+}
+
+impl RemAssign for Beats {
+    fn rem_assign(&mut self, rhs: Beats) {
+        *self = *self % rhs;
+    }
+}
+
 impl ToPrimitive for Beats {
     fn to_u64(&self) -> Option<u64> {
         self.beats().to_u64()
@@ -149,4 +180,3 @@ impl FromPrimitive for Beats {
         Some(Beats(n as NumDiv))
     }
 }
-

src/division.rs

@@ -210,4 +210,3 @@ impl Sub<isize> for DivType {
         self.to_isize().unwrap() - rhs
     }
 }
-

src/ms.rs

@@ -6,7 +6,8 @@
 //!
 
 use num::{FromPrimitive, ToPrimitive};
-use std::ops::{Add, Sub, Mul, Div, Rem, Neg};
+use std::ops::{Add, Sub, Mul, Div, Rem, Neg,
+               AddAssign, SubAssign, MulAssign, DivAssign, RemAssign};
 use super::calc;
 use super::{
     Bars,
@@ -122,6 +123,36 @@ impl Neg for Ms {
     }
 }
 
+impl AddAssign for Ms {
+    fn add_assign(&mut self, rhs: Ms) {
+        *self = *self + rhs;
+    }
+}
+
+impl SubAssign for Ms {
+    fn sub_assign(&mut self, rhs: Ms) {
+        *self = *self - rhs;
+    }
+}
+
+impl MulAssign for Ms {
+    fn mul_assign(&mut self, rhs: Ms) {
+        *self = *self * rhs;
+    }
+}
+
+impl DivAssign for Ms {
+    fn div_assign(&mut self, rhs: Ms) {
+        *self = *self / rhs;
+    }
+}
+
+impl RemAssign for Ms {
+    fn rem_assign(&mut self, rhs: Ms) {
+        *self = *self % rhs;
+    }
+}
+
 impl ToPrimitive for Ms {
     fn to_u64(&self) -> Option<u64> {
         self.ms().to_u64()
@@ -139,4 +170,3 @@ impl FromPrimitive for Ms {
         Some(Ms(n as calc::Ms))
     }
 }
-

src/samples.rs

@@ -6,7 +6,8 @@
 //!
 
 use num::{FromPrimitive, ToPrimitive};
-use std::ops::{Add, Sub, Mul, Div, Rem, Neg};
+use std::ops::{Add, Sub, Mul, Div, Rem, Neg,
+               AddAssign, SubAssign, MulAssign, DivAssign, RemAssign};
 use super::calc;
 use super::{
     Bars,
@@ -121,6 +122,36 @@ impl Neg for Samples {
     }
 }
 
+impl AddAssign for Samples {
+    fn add_assign(&mut self, rhs: Samples) {
+        *self = *self + rhs;
+    }
+}
+
+impl SubAssign for Samples {
+    fn sub_assign(&mut self, rhs: Samples) {
+        *self = *self - rhs;
+    }
+}
+
+impl MulAssign for Samples {
+    fn mul_assign(&mut self, rhs: Samples) {
+        *self = *self * rhs;
+    }
+}
+
+impl DivAssign for Samples {
+    fn div_assign(&mut self, rhs: Samples) {
+        *self = *self / rhs;
+    }
+}
+
+impl RemAssign for Samples {
+    fn rem_assign(&mut self, rhs: Samples) {
+        *self = *self % rhs;
+    }
+}
+
 impl ToPrimitive for Samples {
     fn to_u64(&self) -> Option<u64> {
         self.samples().to_u64()
@@ -138,4 +169,3 @@ impl FromPrimitive for Samples {
         Some(Samples(n as calc::Samples))
     }
 }
-

src/ticks.rs

@@ -6,7 +6,8 @@
 //!
 
 use num::{FromPrimitive, ToPrimitive};
-use std::ops::{Add, Sub, Mul, Div, Rem, Neg};
+use std::ops::{Add, Sub, Mul, Div, Rem, Neg,
+               AddAssign, SubAssign, MulAssign, DivAssign, RemAssign};
 use super::calc;
 use super::{
     Bars,
@@ -120,6 +121,36 @@ impl Neg for Ticks {
     }
 }
 
+impl AddAssign for Ticks {
+    fn add_assign(&mut self, rhs: Ticks) {
+        *self = *self + rhs;
+    }
+}
+
+impl SubAssign for Ticks {
+    fn sub_assign(&mut self, rhs: Ticks) {
+        *self = *self - rhs;
+    }
+}
+
+impl MulAssign for Ticks {
+    fn mul_assign(&mut self, rhs: Ticks) {
+        *self = *self * rhs;
+    }
+}
+
+impl DivAssign for Ticks {
+    fn div_assign(&mut self, rhs: Ticks) {
+        *self = *self / rhs;
+    }
+}
+
+impl RemAssign for Ticks {
+    fn rem_assign(&mut self, rhs: Ticks) {
+        *self = *self % rhs;
+    }
+}
+
 impl ToPrimitive for Ticks {
     fn to_u64(&self) -> Option<u64> {
         self.ticks().to_u64()
@@ -137,4 +168,3 @@ impl FromPrimitive for Ticks {
         Some(Ticks(n as calc::Ticks))
     }
 }
-