utils are now successfully compiling, will probably remove linked_list soon

Author: mitchmindtree

Cargo.lock

@@ -6,14 +6,15 @@
 //!  A collection of custom iterators for iterating things!
 //!
 
-pub use prev_iter::ZipPrev;
+pub use self::prev_iter::ZipPrev;
 
 pub mod prev_iter {
 
     /// A trait that produces the previous step's element along
     /// with the current step.
-    pub trait ZipPrev: Iterator {
-        fn zip_prev(self) -> PairIterator;
+    pub trait ZipPrev<A, I>: Iterator<A>
+    where A: Clone, I: Iterator<A> {
+        fn zip_prev(self) -> PairIterator<A, I>;
     }
 
     /// A struct produced by the ZipPrevious iterator.
@@ -26,18 +27,19 @@ pub mod prev_iter {
     where A: Clone, I: Iterator<A> {
         #[inline]
         fn next(&mut self) -> Option<(A, Option<A>)> {
-            let PairIterator(ref mut part_iter, ref mut maybe_prev) = *self;
-            if let Some(part) = self.part_iter.next() {
-                let maybe_prev = self.maybe_prev.clone();
-                self.maybe_prev = Some(part);
-                Some(part, maybe_prev)
+            let PairIterator { ref mut iter, ref mut maybe_prev } = *self;
+            if let Some(item) = iter.next() {
+                let maybe_prev_clone = maybe_prev.clone();
+                *maybe_prev = Some(item.clone());
+                Some((item, maybe_prev_clone))
             } else {
                 None
             }
         }
     }
 
-    impl<A, I> ZipPrev for I where A: Clone, I: Iterator<A> {
+    impl<A, I> ZipPrev<A, I> for I
+    where A: Clone, I: Iterator<A> {
         fn zip_prev(self) -> PairIterator<A, I> {
             PairIterator {
                 iter: self,

src/iter.rs

@@ -1,3 +1,28 @@
-#[test]
-fn it_works() {
-}
+//!
+//!  mod.rs
+//!
+//!  Created by Mitchell Nordine at 11:25AM on November 07, 2014.
+//!
+//!
+
+#![feature(if_let)]
+
+pub use iter::{
+    ZipPrev,
+};
+pub use math::{
+    clamp,
+    fast_floor,
+    fmod,
+    grad1,
+    in_range,
+    lerp,
+    map_range,
+    modulo,
+    remainder,
+    wrap,
+};
+
+pub mod iter;
+pub mod math;
+

src/lib.rs

@@ -9,16 +9,50 @@ use std::mem;
 use std::num::One;
 use std::num::zero;
 
-/// The modulo function.
+/// Clamp a value to a range.
 #[inline]
-pub fn modulo<I: Int>(a: I, b: I) -> I {
-    match a % b {
-        r if (r > zero() && b < zero())
-          || (r < zero() && b > zero()) => (r + b),
-        r                               => r,
+pub fn clamp<T: Num + Primitive>(val: T, min: T, max: T) -> T {
+    if val < min { min } else { if val > max { max } else { val } }
+}
+
+/// Floors value.
+#[inline]
+pub fn fast_floor<F: Float + FromPrimitive + ToPrimitive>(f: F) -> int {
+    return if f > FromPrimitive::from_int(0).unwrap() {
+        f.to_int().unwrap()
+    } else {
+        f.to_int().unwrap() - One::one()
     }
 }
 
+/// Models the CPP fmod function.
+#[inline]
+pub fn fmod<F: Float + FromPrimitive + ToPrimitive>(numer: F, denom: F) -> F {
+    let rquot: F = (numer / denom).floor();
+    numer - rquot * denom
+}
+
+/// Implementation of grad1 for the ported _slang_library_noise1 method
+#[inline]
+pub fn grad1(hash: int, x: f32) -> f32 {
+    let h: int = hash & 15;
+    let mut grad: f32 = 1.0f32 + ((h & 7) as f32);
+    if h & 8 > 0 { grad = (-1.0f32) * grad; }
+    grad * x
+}
+
+/// Check if value is in range.
+#[inline]
+pub fn in_range<T: Num + Primitive>(val: T, min: T, max: T) -> bool {
+    val >= min && val <= max
+}
+
+/// Interpolate from start to stop 'amt' amount.
+#[inline]
+pub fn lerp(start: f32, stop: f32, amt: f32) -> f32 {
+    start + (stop - start) * amt
+}
+
 /// Map a value from a given range to a new given range.
 #[inline]
 pub fn map_range<X: Num + Copy + FromPrimitive + ToPrimitive,
@@ -41,22 +75,21 @@ pub fn map_range<X: Num + Copy + FromPrimitive + ToPrimitive,
     ).unwrap()
 }
 
-/// Clamp a value to a range.
-#[inline]
-pub fn clamp<T: Num + Primitive>(val: T, min: T, max: T) -> T {
-    if val < min { min } else { if val > max { max } else { val } }
-}
-
-/// Check if value is in range.
+/// Models the CPP remainder function.
 #[inline]
-pub fn in_range<T: Num + Primitive>(val: T, min: T, max: T) -> bool {
-    val >= min && val <= max
+pub fn remainder<F: Float + FromPrimitive + ToPrimitive>(numer: F, denom: F) -> F {
+    let rquot: F = (numer / denom).round();
+    numer - rquot * denom
 }
 
-/// Interpolate from start to stop 'amt' amount.
+/// The modulo function.
 #[inline]
-pub fn lerp(start: f32, stop: f32, amt: f32) -> f32 {
-    start + (stop - start) * amt
+pub fn modulo<I: Int>(a: I, b: I) -> I {
+    match a % b {
+        r if (r > zero() && b < zero())
+          || (r < zero() && b > zero()) => (r + b),
+        r                               => r,
+    }
 }
 
 /// Wrap value to a range.
@@ -68,39 +101,6 @@ pub fn wrap(val: f32, mut from: f32, mut to: f32) -> f32 {
     val - cycle * ((val - from) / cycle).floor()
 }
 
-/// Floors value.
-#[inline]
-pub fn fast_floor<F: Float + FromPrimitive + ToPrimitive>(f: F) -> int {
-    return if f > FromPrimitive::from_int(0).unwrap() {
-        f.to_int().unwrap()
-    } else {
-        f.to_int().unwrap() - One::one()
-    }
-}
-
-/// Models the CPP remainder function.
-#[inline]
-pub fn remainder<F: Float + FromPrimitive + ToPrimitive>(numer: F, denom: F) -> F {
-    let rquot: F = (numer / denom).round();
-    numer - rquot * denom
-}
-
-/// Models the CPP fmod function.
-#[inline]
-pub fn fmod<F: Float + FromPrimitive + ToPrimitive>(numer: F, denom: F) -> F {
-    let rquot: F = (numer / denom).floor();
-    numer - rquot * denom
-}
-
-/// Implementation of grad1 for the ported _slang_library_noise1 method
-#[inline]
-pub fn grad1(hash: int, x: f32) -> f32 {
-    let h: int = hash & 15;
-    let mut grad: f32 = 1.0f32 + ((h & 7) as f32);
-    if h & 8 > 0 { grad = (-1.0f32) * grad; }
-    grad * x
-}
-
 /// Implementation of perm for the ported _slang_library_noise1 method
 const PERM : [u8, ..512] = [151u8, 160u8, 137u8, 91u8, 90u8, 15u8,
       131u8, 13u8, 201u8,95u8,96u8,53u8,194u8,233u8,7u8,225u8,140u8,36u8,103u8,30u8,69u8,142u8,8u8,99u8,37u8,240u8,21u8,10u8,23u8,