Merge pull request dimforge#110 from andersk/annotation

Add type annotation required by rustc 2015-03-31
andersk · Apr 1, 2015 · f44b338 · f44b338
2 parents 1fc59cb + 1cb3314
commit f44b338
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -541,7 +541,7 @@ pub fn prepend_rotation<V, M: Rotation<V>>(m: &M, v: &V) -> M {
 /// use na::{BaseFloat, Rot3, Vec3};
 ///
 /// fn main() {
-///     let t  = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5 * BaseFloat::pi()));
+///     let t  = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5 * <f64 as BaseFloat>::pi()));
 ///     let v  = Vec3::new(1.0, 0.0, 0.0);
 ///
 ///     let tv = na::rotate(&t, &v);
@@ -562,7 +562,7 @@ pub fn rotate<V, M: Rotate<V>>(m: &M, v: &V) -> V {
 /// use na::{BaseFloat, Rot3, Vec3};
 ///
 /// fn main() {
-///     let t  = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5 * BaseFloat::pi()));
+///     let t  = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5 * <f64 as BaseFloat>::pi()));
 ///     let v  = Vec3::new(1.0, 0.0, 0.0);
 ///
 ///     let tv = na::inv_rotate(&t, &v);

diff --git a/src/structs/dmat.rs b/src/structs/dmat.rs
@@ -498,7 +498,7 @@ impl<N: Clone + Copy> Transpose for DMat<N> {
 impl<N: BaseNum + Cast<f64> + Clone> Mean<DVec<N>> for DMat<N> {
     fn mean(&self) -> DVec<N> {
         let mut res: DVec<N> = DVec::new_zeros(self.ncols);
-        let normalizer: N    = Cast::from(1.0f64 / Cast::from(self.nrows));
+        let normalizer: N    = Cast::from(1.0f64 / self.nrows as f64);
 
         for i in 0..self.nrows {
             for j in 0..self.ncols {