From 65d3a40c07d1efae8039d3341a07ac748063fc79 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Mon, 1 Dec 2014 15:52:17 -0500
Subject: [PATCH] libcore: fix move semantics fallout

---
 src/libcore/iter.rs    | 2 +-
 src/libcore/num/mod.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index 8ee2a8874bb..5405c7aa3b7 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -2166,7 +2166,7 @@ impl<A: Add<A, A> + Clone> Iterator<A> for Counter<A> {
     #[inline]
     fn next(&mut self) -> Option<A> {
         let result = self.state.clone();
-        self.state = self.state + self.step;
+        self.state = self.state.clone() + self.step.clone();
         Some(result)
     }
 
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 3c9b68b350b..2416cf5bcc7 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -37,8 +37,8 @@ use str::{FromStr, from_str, StrPrelude};
 /// Simultaneous division and remainder
 #[inline]
 #[deprecated = "use division and remainder directly"]
-pub fn div_rem<T: Div<T, T> + Rem<T, T>>(x: T, y: T) -> (T, T) {
-    (x / y, x % y)
+pub fn div_rem<T: Clone + Div<T, T> + Rem<T, T>>(x: T, y: T) -> (T, T) {
+    (x.clone() / y.clone(), x % y)
 }
 
 /// Raises a `base` to the power of `exp`, using exponentiation by squaring.