Skip to content

Commit e7fab22

Browse files
committed
Fallout from deprecation
1 parent bdbc09a commit e7fab22

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/libcore/num/f32.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,12 @@ impl Float for f32 {
429429

430430
/// Converts to degrees, assuming the number is in radians.
431431
#[inline]
432-
fn to_degrees(self) -> f32 { self * (180.0f32 / Float::pi()) }
432+
fn to_degrees(self) -> f32 { self * (180.0f32 / consts::PI) }
433433

434434
/// Converts to radians, assuming the number is in degrees.
435435
#[inline]
436436
fn to_radians(self) -> f32 {
437-
let value: f32 = Float::pi();
437+
let value: f32 = consts::PI;
438438
self * (value / 180.0f32)
439439
}
440440
}

src/libcore/num/f64.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -437,12 +437,12 @@ impl Float for f64 {
437437

438438
/// Converts to degrees, assuming the number is in radians.
439439
#[inline]
440-
fn to_degrees(self) -> f64 { self * (180.0f64 / Float::pi()) }
440+
fn to_degrees(self) -> f64 { self * (180.0f64 / consts::PI) }
441441

442442
/// Converts to radians, assuming the number is in degrees.
443443
#[inline]
444444
fn to_radians(self) -> f64 {
445-
let value: f64 = Float::pi();
445+
let value: f64 = consts::PI;
446446
self * (value / 180.0)
447447
}
448448
}

src/libcore/slice.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering, Less, Equal, Greater, Equiv}
4242
use cmp;
4343
use default::Default;
4444
use iter::*;
45-
use num::{Int, div_rem};
45+
use num::Int;
4646
use ops;
4747
use option::{None, Option, Some};
4848
use ptr;
@@ -1384,7 +1384,8 @@ impl<'a, T> Iterator<&'a [T]> for Chunks<'a, T> {
13841384
if self.v.len() == 0 {
13851385
(0, Some(0))
13861386
} else {
1387-
let (n, rem) = div_rem(self.v.len(), self.size);
1387+
let n = self.v.len() / self.size;
1388+
let rem = self.v.len() % self.size;
13881389
let n = if rem > 0 { n+1 } else { n };
13891390
(n, Some(n))
13901391
}
@@ -1457,7 +1458,8 @@ impl<'a, T> Iterator<&'a mut [T]> for MutChunks<'a, T> {
14571458
if self.v.len() == 0 {
14581459
(0, Some(0))
14591460
} else {
1460-
let (n, rem) = div_rem(self.v.len(), self.chunk_size);
1461+
let n = self.v.len() / self.chunk_size;
1462+
let rem = self.v.len() % self.chunk_size;
14611463
let n = if rem > 0 { n + 1 } else { n };
14621464
(n, Some(n))
14631465
}

0 commit comments

Comments
 (0)