diff --git a/src/libcore/num/f32.rs b/src/libcore/num/f32.rs index 8092aa67b8fa..add42a2ddce8 100644 --- a/src/libcore/num/f32.rs +++ b/src/libcore/num/f32.rs @@ -429,12 +429,12 @@ fn log10(self) -> f32 { /// Converts to degrees, assuming the number is in radians. #[inline] - fn to_degrees(self) -> f32 { self * (180.0f32 / Float::pi()) } + fn to_degrees(self) -> f32 { self * (180.0f32 / consts::PI) } /// Converts to radians, assuming the number is in degrees. #[inline] fn to_radians(self) -> f32 { - let value: f32 = Float::pi(); + let value: f32 = consts::PI; self * (value / 180.0f32) } } diff --git a/src/libcore/num/f64.rs b/src/libcore/num/f64.rs index 3ecedac732d8..12c0771d0b93 100644 --- a/src/libcore/num/f64.rs +++ b/src/libcore/num/f64.rs @@ -437,12 +437,12 @@ fn log10(self) -> f64 { /// Converts to degrees, assuming the number is in radians. #[inline] - fn to_degrees(self) -> f64 { self * (180.0f64 / Float::pi()) } + fn to_degrees(self) -> f64 { self * (180.0f64 / consts::PI) } /// Converts to radians, assuming the number is in degrees. #[inline] fn to_radians(self) -> f64 { - let value: f64 = Float::pi(); + let value: f64 = consts::PI; self * (value / 180.0) } } diff --git a/src/libcore/slice.rs b/src/libcore/slice.rs index 7923c46717e6..48e52fab51c5 100644 --- a/src/libcore/slice.rs +++ b/src/libcore/slice.rs @@ -42,7 +42,7 @@ use cmp; use default::Default; use iter::*; -use num::{Int, div_rem}; +use num::Int; use ops; use option::{None, Option, Some}; use ptr; @@ -1384,7 +1384,8 @@ fn size_hint(&self) -> (uint, Option) { if self.v.len() == 0 { (0, Some(0)) } else { - let (n, rem) = div_rem(self.v.len(), self.size); + let n = self.v.len() / self.size; + let rem = self.v.len() % self.size; let n = if rem > 0 { n+1 } else { n }; (n, Some(n)) } @@ -1457,7 +1458,8 @@ fn size_hint(&self) -> (uint, Option) { if self.v.len() == 0 { (0, Some(0)) } else { - let (n, rem) = div_rem(self.v.len(), self.chunk_size); + let n = self.v.len() / self.chunk_size; + let rem = self.v.len() % self.chunk_size; let n = if rem > 0 { n + 1 } else { n }; (n, Some(n)) }