diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-09-15 09:50:17 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-10-02 07:55:41 -0700 |
| commit | d9d1dfc1955fabb7ee3a55e9c84cdcd5aad67417 (patch) | |
| tree | 44ee6031936df55eb8d34db48298b2a67b21cc3b /src/test | |
| parent | 17548378a707fae752dc722e2fb767a65195e422 (diff) | |
| download | rust-d9d1dfc1955fabb7ee3a55e9c84cdcd5aad67417.tar.gz rust-d9d1dfc1955fabb7ee3a55e9c84cdcd5aad67417.zip | |
std: Replace num::IntConvertible with {To,From}Primitive
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/run-pass/numeric-method-autoexport.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/trait-inheritance-num.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/trait-inheritance-num0.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/trait-inheritance-num1.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/trait-inheritance-num3.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/trait-inheritance-num5.rs | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/run-pass/numeric-method-autoexport.rs index f2df3fc66ea..1422f93e612 100644 --- a/src/test/run-pass/numeric-method-autoexport.rs +++ b/src/test/run-pass/numeric-method-autoexport.rs @@ -36,6 +36,6 @@ pub fn main() { // floats // num - assert_eq!(10f32.to_int(), 10); - assert_eq!(10f64.to_int(), 10); + assert_eq!(10f32.to_int().unwrap(), 10); + assert_eq!(10f64.to_int().unwrap(), 10); } diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs index 87de3a2be14..8d3c258558e 100644 --- a/src/test/run-pass/trait-inheritance-num.rs +++ b/src/test/run-pass/trait-inheritance-num.rs @@ -19,7 +19,7 @@ pub trait NumExt: Num + NumCast + Eq + Ord {} pub trait FloatExt: NumExt + ApproxEq<Self> {} -fn greater_than_one<T:NumExt>(n: &T) -> bool { *n > NumCast::from(1) } -fn greater_than_one_float<T:FloatExt>(n: &T) -> bool { *n > NumCast::from(1) } +fn greater_than_one<T:NumExt>(n: &T) -> bool { *n > NumCast::from(1).unwrap() } +fn greater_than_one_float<T:FloatExt>(n: &T) -> bool { *n > NumCast::from(1).unwrap() } pub fn main() {} diff --git a/src/test/run-pass/trait-inheritance-num0.rs b/src/test/run-pass/trait-inheritance-num0.rs index ae285f3bc95..46efac84907 100644 --- a/src/test/run-pass/trait-inheritance-num0.rs +++ b/src/test/run-pass/trait-inheritance-num0.rs @@ -22,7 +22,7 @@ trait Num { pub trait NumExt: Num + NumCast { } fn greater_than_one<T:NumExt>(n: &T) -> bool { - n.gt(&NumCast::from(1)) + n.gt(&NumCast::from(1).unwrap()) } pub fn main() {} diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/run-pass/trait-inheritance-num1.rs index d22a8154a5b..28abae175cd 100644 --- a/src/test/run-pass/trait-inheritance-num1.rs +++ b/src/test/run-pass/trait-inheritance-num1.rs @@ -14,7 +14,7 @@ use std::num::NumCast; pub trait NumExt: Num + NumCast + Ord { } fn greater_than_one<T:NumExt>(n: &T) -> bool { - *n > NumCast::from(1) + *n > NumCast::from(1).unwrap() } pub fn main() {} diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/run-pass/trait-inheritance-num3.rs index b7150e873a5..7909f015912 100644 --- a/src/test/run-pass/trait-inheritance-num3.rs +++ b/src/test/run-pass/trait-inheritance-num3.rs @@ -16,7 +16,7 @@ pub trait NumExt: Eq + Ord + Num + NumCast {} impl NumExt for f32 {} fn num_eq_one<T:NumExt>(n: T) { - println!("{}", n == NumCast::from(1)) + println!("{}", n == NumCast::from(1).unwrap()) } pub fn main() { diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/run-pass/trait-inheritance-num5.rs index aee954df461..0310dde2a6d 100644 --- a/src/test/run-pass/trait-inheritance-num5.rs +++ b/src/test/run-pass/trait-inheritance-num5.rs @@ -17,7 +17,7 @@ impl NumExt for f32 {} impl NumExt for int {} fn num_eq_one<T:NumExt>() -> T { - NumCast::from(1) + NumCast::from(1).unwrap() } pub fn main() { |