Skip to content

Commit bc6eaf2

Browse files
committed
More core mode forbidding.
1 parent 5394e34 commit bc6eaf2

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

src/libcore/f32.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// NB: transitionary, de-mode-ing.
2+
#[forbid(deprecated_mode)];
3+
#[forbid(deprecated_pattern)];
4+
15
//! Operations and constants for `f32`
26
37
// PORT

src/libcore/f64.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// NB: transitionary, de-mode-ing.
2+
#[forbid(deprecated_mode)];
3+
#[forbid(deprecated_pattern)];
4+
15
//! Operations and constants for `f64`
26
37
// PORT

src/libcore/float.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// NB: transitionary, de-mode-ing.
2+
#[forbid(deprecated_mode)];
3+
#[forbid(deprecated_pattern)];
4+
15
//! Operations and constants for `float`
26
37
// Even though this module exports everything defined in it,
@@ -238,12 +242,12 @@ fn to_str(num: float, digits: uint) -> ~str {
238242
* `none` if the string did not represent a valid number. Otherwise,
239243
* `some(n)` where `n` is the floating-point number represented by `[num]`.
240244
*/
241-
fn from_str(num: ~str) -> option<float> {
242-
if num == ~"inf" {
245+
fn from_str(num: &str) -> option<float> {
246+
if num == "inf" {
243247
return some(infinity as float);
244-
} else if num == ~"-inf" {
248+
} else if num == "-inf" {
245249
return some(neg_infinity as float);
246-
} else if num == ~"NaN" {
250+
} else if num == "NaN" {
247251
return some(NaN as float);
248252
}
249253

@@ -516,7 +520,7 @@ fn test_to_str_inf() {
516520

517521
#[test]
518522
fn test_traits() {
519-
fn test<U:num::Num>(ten: U) {
523+
fn test<U:num::Num>(ten: &U) {
520524
assert (ten.to_int() == 10);
521525

522526
let two = ten.from_int(2);
@@ -529,7 +533,7 @@ fn test_traits() {
529533
assert (ten.modulo(two) == ten.from_int(0));
530534
}
531535

532-
test(10.0);
536+
test(&10.0);
533537
}
534538

535539

0 commit comments

Comments
 (0)