From db518ef68abdbf6ef05693dc492147ce5ec7219e Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Wed, 15 May 2013 14:10:42 -0700 Subject: [PATCH] test: Fix tests. --- src/test/auxiliary/extern-crosscrate-source.rs | 6 ++++-- src/test/run-pass/const-cast.rs | 2 +- src/test/run-pass/const-cross-crate-extern.rs | 2 +- src/test/run-pass/const-extern-function.rs | 2 +- src/test/run-pass/extern-call-deep.rs | 6 ++++-- src/test/run-pass/extern-call-deep2.rs | 6 ++++-- src/test/run-pass/extern-call-scrub.rs | 6 ++++-- src/test/run-pass/extern-call.rs | 4 +++- src/test/run-pass/extern-stress.rs | 6 ++++-- src/test/run-pass/extern-take-value.rs | 8 ++++---- src/test/run-pass/extern-yield.rs | 6 ++++-- src/test/run-pass/float-nan.rs | 10 ++++------ src/test/run-pass/foreign-call-no-runtime.rs | 3 ++- src/test/run-pass/static-method-xcrate.rs | 5 ++--- src/test/run-pass/trait-inheritance-num.rs | 6 +++--- src/test/run-pass/trait-inheritance-num0.rs | 4 ++-- src/test/run-pass/trait-inheritance-num1.rs | 4 ++-- src/test/run-pass/trait-inheritance-num2.rs | 1 - src/test/run-pass/trait-inheritance-num3.rs | 6 ++++-- src/test/run-pass/trait-inheritance-num5.rs | 4 ++-- 20 files changed, 55 insertions(+), 42 deletions(-) diff --git a/src/test/auxiliary/extern-crosscrate-source.rs b/src/test/auxiliary/extern-crosscrate-source.rs index d59057f01f2..c7e8e899135 100644 --- a/src/test/auxiliary/extern-crosscrate-source.rs +++ b/src/test/auxiliary/extern-crosscrate-source.rs @@ -15,8 +15,10 @@ pub mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) - -> libc::uintptr_t; + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) + -> libc::uintptr_t; } } diff --git a/src/test/run-pass/const-cast.rs b/src/test/run-pass/const-cast.rs index 1c8e92b91cd..2f7ccfe2a3a 100644 --- a/src/test/run-pass/const-cast.rs +++ b/src/test/run-pass/const-cast.rs @@ -10,7 +10,7 @@ extern fn foo() {} -static x: *u8 = foo; +static x: extern "C" fn() = foo; static y: *libc::c_void = x as *libc::c_void; static a: &'static int = &10; static b: *int = a as *int; diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/run-pass/const-cross-crate-extern.rs index 5281c217626..66db6c824bc 100644 --- a/src/test/run-pass/const-cross-crate-extern.rs +++ b/src/test/run-pass/const-cross-crate-extern.rs @@ -13,7 +13,7 @@ extern mod cci_const; use cci_const::bar; -static foo: *u8 = bar; +static foo: extern "C" fn() = bar; pub fn main() { assert_eq!(foo, cci_const::bar); diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/run-pass/const-extern-function.rs index 9a8104cb14f..513f93a6760 100644 --- a/src/test/run-pass/const-extern-function.rs +++ b/src/test/run-pass/const-extern-function.rs @@ -10,7 +10,7 @@ extern fn foopy() {} -static f: *u8 = foopy; +static f: extern "C" fn() = foopy; static s: S = S { f: foopy }; struct S { diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/run-pass/extern-call-deep.rs index b8cdfcb0c4c..2e95873b60d 100644 --- a/src/test/run-pass/extern-call-deep.rs +++ b/src/test/run-pass/extern-call-deep.rs @@ -10,8 +10,10 @@ mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) - -> libc::uintptr_t; + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) + -> libc::uintptr_t; } } diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/run-pass/extern-call-deep2.rs index eb7ab055b07..6ad1c531d9a 100644 --- a/src/test/run-pass/extern-call-deep2.rs +++ b/src/test/run-pass/extern-call-deep2.rs @@ -10,8 +10,10 @@ mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) - -> libc::uintptr_t; + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) + -> libc::uintptr_t; } } diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/run-pass/extern-call-scrub.rs index 4111f9eb00e..2caf4cbf2bc 100644 --- a/src/test/run-pass/extern-call-scrub.rs +++ b/src/test/run-pass/extern-call-scrub.rs @@ -14,8 +14,10 @@ mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) - -> libc::uintptr_t; + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) + -> libc::uintptr_t; } } diff --git a/src/test/run-pass/extern-call.rs b/src/test/run-pass/extern-call.rs index ec335cf8a82..6c36c4aa8f6 100644 --- a/src/test/run-pass/extern-call.rs +++ b/src/test/run-pass/extern-call.rs @@ -10,7 +10,9 @@ mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) -> libc::uintptr_t; } } diff --git a/src/test/run-pass/extern-stress.rs b/src/test/run-pass/extern-stress.rs index 1a1e0ca7b6d..b12295ab576 100644 --- a/src/test/run-pass/extern-stress.rs +++ b/src/test/run-pass/extern-stress.rs @@ -13,8 +13,10 @@ mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) - -> libc::uintptr_t; + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) + -> libc::uintptr_t; } } diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/run-pass/extern-take-value.rs index 542686c9099..c3fe458802d 100644 --- a/src/test/run-pass/extern-take-value.rs +++ b/src/test/run-pass/extern-take-value.rs @@ -15,10 +15,10 @@ extern fn g() { } pub fn main() { - // extern functions are *u8 types - let a: *u8 = f; - let b: *u8 = f; - let c: *u8 = g; + // extern functions are extern function types + let a: extern "C" fn() = f; + let b: extern "C" fn() = f; + let c: extern "C" fn() = g; assert_eq!(a, b); assert!(a != c); diff --git a/src/test/run-pass/extern-yield.rs b/src/test/run-pass/extern-yield.rs index 067968ddb9f..16b1c7cd6f4 100644 --- a/src/test/run-pass/extern-yield.rs +++ b/src/test/run-pass/extern-yield.rs @@ -10,8 +10,10 @@ mod rustrt { pub extern { - pub fn rust_dbg_call(cb: *u8, data: libc::uintptr_t) - -> libc::uintptr_t; + pub fn rust_dbg_call(cb: extern "C" fn(data: libc::uintptr_t) + -> libc::uintptr_t, + data: libc::uintptr_t) + -> libc::uintptr_t; } } diff --git a/src/test/run-pass/float-nan.rs b/src/test/run-pass/float-nan.rs index de3ce4d8149..4ea1604a18c 100644 --- a/src/test/run-pass/float-nan.rs +++ b/src/test/run-pass/float-nan.rs @@ -10,16 +10,14 @@ extern mod std; -use core::num::Float::{ - NaN, infinity, neg_infinity -}; +use core::num::Float; pub fn main() { - let nan = NaN::(); + let nan = Float::NaN::(); assert!((nan).is_NaN()); - let inf = infinity::(); - assert_eq!(-inf, neg_infinity::()); + let inf = Float::infinity::(); + assert_eq!(-inf, Float::neg_infinity::()); assert!( nan != nan); assert!( nan != -nan); diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/run-pass/foreign-call-no-runtime.rs index 3f61fca8726..6f94b163315 100644 --- a/src/test/run-pass/foreign-call-no-runtime.rs +++ b/src/test/run-pass/foreign-call-no-runtime.rs @@ -1,7 +1,8 @@ use core::unstable::run_in_bare_thread; extern { - pub fn rust_dbg_call(cb: *u8, + pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t) + -> libc::uintptr_t, data: libc::uintptr_t) -> libc::uintptr_t; } diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/run-pass/static-method-xcrate.rs index c5d3b58276e..946c86ab298 100644 --- a/src/test/run-pass/static-method-xcrate.rs +++ b/src/test/run-pass/static-method-xcrate.rs @@ -13,11 +13,10 @@ extern mod static_methods_crate; use static_methods_crate::read; -use readMaybeRenamed = static_methods_crate::read::readMaybe; pub fn main() { let result: int = read(~"5"); assert_eq!(result, 5); - assert_eq!(readMaybeRenamed(~"false"), Some(false)); - assert_eq!(readMaybeRenamed(~"foo"), None::); + assert_eq!(read::readMaybe(~"false"), Some(false)); + assert_eq!(read::readMaybe(~"foo"), None::); } diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs index 5179d13813c..9135b458f95 100644 --- a/src/test/run-pass/trait-inheritance-num.rs +++ b/src/test/run-pass/trait-inheritance-num.rs @@ -13,13 +13,13 @@ extern mod std; use core::cmp::{Eq, Ord}; -use core::num::NumCast::from; +use core::num::NumCast; pub trait NumExt: Num + NumCast + Eq + Ord {} pub trait FloatExt: NumExt + ApproxEq {} -fn greater_than_one(n: &T) -> bool { *n > from(1) } -fn greater_than_one_float(n: &T) -> bool { *n > from(1) } +fn greater_than_one(n: &T) -> bool { *n > NumCast::from(1) } +fn greater_than_one_float(n: &T) -> bool { *n > NumCast::from(1) } pub fn main() {} diff --git a/src/test/run-pass/trait-inheritance-num0.rs b/src/test/run-pass/trait-inheritance-num0.rs index aae430dc4cd..3e31b8067f9 100644 --- a/src/test/run-pass/trait-inheritance-num0.rs +++ b/src/test/run-pass/trait-inheritance-num0.rs @@ -12,7 +12,7 @@ // Extending Num and using inherited static methods -use core::num::NumCast::from; +use core::num::NumCast; trait Num { fn from_int(i: int) -> Self; @@ -22,7 +22,7 @@ trait Num { pub trait NumExt: Num + NumCast { } fn greater_than_one(n: &T) -> bool { - n.gt(&from(1)) + n.gt(&NumCast::from(1)) } pub fn main() {} diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/run-pass/trait-inheritance-num1.rs index d580b99012f..25741518f66 100644 --- a/src/test/run-pass/trait-inheritance-num1.rs +++ b/src/test/run-pass/trait-inheritance-num1.rs @@ -9,12 +9,12 @@ // except according to those terms. use core::cmp::Ord; -use core::num::NumCast::from; +use core::num::NumCast; pub trait NumExt: Num + NumCast + Ord { } fn greater_than_one(n: &T) -> bool { - *n > from(1) + *n > NumCast::from(1) } pub fn main() {} diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/run-pass/trait-inheritance-num2.rs index f7edd2855a4..2963a815e05 100644 --- a/src/test/run-pass/trait-inheritance-num2.rs +++ b/src/test/run-pass/trait-inheritance-num2.rs @@ -15,7 +15,6 @@ extern mod std; use core::cmp::{Eq, Ord}; -use core::num::NumCast::from; pub trait TypeExt {} diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/run-pass/trait-inheritance-num3.rs index 5f1fef80ef2..667fd335ac4 100644 --- a/src/test/run-pass/trait-inheritance-num3.rs +++ b/src/test/run-pass/trait-inheritance-num3.rs @@ -9,13 +9,15 @@ // except according to those terms. use core::cmp::{Eq, Ord}; -use core::num::NumCast::from; +use core::num::NumCast; pub trait NumExt: Eq + Ord + Num + NumCast {} impl NumExt for f32 {} -fn num_eq_one(n: T) { io::println(fmt!("%?", n == from(1))) } +fn num_eq_one(n: T) { + io::println(fmt!("%?", n == NumCast::from(1))) +} pub fn main() { num_eq_one(1f32); // you need to actually use the function to trigger the ICE diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/run-pass/trait-inheritance-num5.rs index 02cc9a3d221..f1897636c8a 100644 --- a/src/test/run-pass/trait-inheritance-num5.rs +++ b/src/test/run-pass/trait-inheritance-num5.rs @@ -9,7 +9,7 @@ // except according to those terms. use core::cmp::{Eq, Ord}; -use core::num::NumCast::from; +use core::num::NumCast; pub trait NumExt: Eq + Num + NumCast {} @@ -17,7 +17,7 @@ impl NumExt for f32 {} impl NumExt for int {} fn num_eq_one() -> T { - from(1) + NumCast::from(1) } pub fn main() {