From 8f018bfe0d6b4474225270b0c88ff6c08c6ba97e Mon Sep 17 00:00:00 2001
From: ozkriff <ozkriff@gmail.com>
Date: Thu, 24 Apr 2014 22:25:26 +0400
Subject: [PATCH] Updated to latest Rust

---
 src/cgmath/angle.rs | 2 +-
 src/cgmath/array.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cgmath/angle.rs b/src/cgmath/angle.rs
index b80d363..a2d5b60 100644
--- a/src/cgmath/angle.rs
+++ b/src/cgmath/angle.rs
@@ -199,7 +199,7 @@ Angle<S> for Deg<S> {
 #[inline] pub fn asin<S: Float>(s: S) -> Rad<S> { rad(s.asin()) }
 #[inline] pub fn acos<S: Float>(s: S) -> Rad<S> { rad(s.acos()) }
 #[inline] pub fn atan<S: Float>(s: S) -> Rad<S> { rad(s.atan()) }
-#[inline] pub fn atan2<S: Float>(a: S, b: S) -> Rad<S> { rad(a.atan2(&b)) }
+#[inline] pub fn atan2<S: Float>(a: S, b: S) -> Rad<S> { rad(a.atan2(b)) }
 
 impl<S: Float + fmt::Show>
 fmt::Show for Rad<S> {
diff --git a/src/cgmath/array.rs b/src/cgmath/array.rs
index 24d063e..4e4a0bc 100644
--- a/src/cgmath/array.rs
+++ b/src/cgmath/array.rs
@@ -113,8 +113,8 @@ macro_rules! gen_builder(
 
 macro_rules! gen_fold(
     (_2) => ({ f(self.i(0), self.i(1)) });
-    (_3) => ({ f(&f(self.i(0), self.i(1)), self.i(2)) });
-    (_4) => ({ f(&f(&f(self.i(0), self.i(1)), self.i(2)), self.i(3)) });
+    (_3) => ({ let tmp = f(self.i(0), self.i(1)); f(&tmp, self.i(2)) });
+    (_4) => ({ let tmp1 = f(self.i(0), self.i(1)); let tmp2 = f(&tmp1, self.i(2)); f(&tmp2, self.i(3)) });
 )
 
 macro_rules! gen_each_mut(