Fallout from deprecation

This commit is contained in:
Aaron Turon 2014-11-18 20:22:13 -08:00
parent bdbc09ad48
commit e7fab22bbf
3 changed files with 9 additions and 7 deletions

View File

@ -429,12 +429,12 @@ impl Float for 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)
}
}

View File

@ -437,12 +437,12 @@ impl Float for 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)
}
}

View File

@ -42,7 +42,7 @@ use cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering, Less, Equal, Greater, Equiv}
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 @@ impl<'a, T> Iterator<&'a [T]> for Chunks<'a, T> {
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 @@ impl<'a, T> Iterator<&'a mut [T]> for MutChunks<'a, T> {
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))
}