rename some more tests

diff --git a/tests/run-pass/coercions.rs b/tests/run-pass/coercions.rs
new file mode 100644 (file)
index 0000000..bfc821f
--- /dev/null
+++ b/tests/run-pass/coercions.rs
@@ -0,0 +1,73 @@
+#![feature(coerce_unsized, unsize)]
+
+use std::ops::CoerceUnsized;
+use std::marker::Unsize;
+
+fn identity_coercion(x: &(dyn Fn(u32)->u32 + Send)) -> &dyn Fn(u32)->u32 {
+    x
+}
+fn fn_coercions(f: &fn(u32) -> u32) ->
+    (unsafe fn(u32) -> u32,
+     &(dyn Fn(u32) -> u32 + Send))
+{
+    (*f, f)
+}
+
+fn simple_array_coercion(x: &[u8; 3]) -> &[u8] { x }
+
+fn square(a: u32) -> u32 { a * a }
+
+#[derive(PartialEq,Eq)]
+struct PtrWrapper<'a, T: 'a+?Sized>(u32, u32, (), &'a T);
+impl<'a, T: ?Sized+Unsize<U>, U: ?Sized>
+    CoerceUnsized<PtrWrapper<'a, U>> for PtrWrapper<'a, T> {}
+
+struct TrivPtrWrapper<'a, T: 'a+?Sized>(&'a T);
+impl<'a, T: ?Sized+Unsize<U>, U: ?Sized>
+    CoerceUnsized<TrivPtrWrapper<'a, U>> for TrivPtrWrapper<'a, T> {}
+
+fn coerce_ptr_wrapper(p: PtrWrapper<[u8; 3]>) -> PtrWrapper<[u8]> {
+    p
+}
+
+fn coerce_triv_ptr_wrapper(p: TrivPtrWrapper<[u8; 3]>) -> TrivPtrWrapper<[u8]> {
+    p
+}
+
+fn coerce_fat_ptr_wrapper(p: PtrWrapper<dyn Fn(u32) -> u32 + Send>)
+                          -> PtrWrapper<dyn Fn(u32) -> u32> {
+    p
+}
+
+fn coerce_ptr_wrapper_poly<'a, T, Trait: ?Sized>(p: PtrWrapper<'a, T>)
+                                                 -> PtrWrapper<'a, Trait>
+    where PtrWrapper<'a, T>: CoerceUnsized<PtrWrapper<'a, Trait>>
+{
+    p
+}
+
+fn main() {
+    let a = [0,1,2];
+    let square_local : fn(u32) -> u32 = square;
+    let (f,g) = fn_coercions(&square_local);
+    // cannot use `square as *const ()` because we can't know whether the compiler duplicates
+    // functions, so two function pointers are only equal if they result from the same function
+    // to function pointer cast
+    assert_eq!(f as *const (), square_local as *const());
+    assert_eq!(g(4), 16);
+    assert_eq!(identity_coercion(g)(5), 25);
+
+    assert_eq!(simple_array_coercion(&a), &a);
+    let w = coerce_ptr_wrapper(PtrWrapper(2,3,(),&a));
+    assert!(w == PtrWrapper(2,3,(),&a) as PtrWrapper<[u8]>);
+
+    let w = coerce_triv_ptr_wrapper(TrivPtrWrapper(&a));
+    assert_eq!(&w.0, &a);
+
+    let z = coerce_fat_ptr_wrapper(PtrWrapper(2,3,(),&square_local));
+    assert_eq!((z.3)(6), 36);
+
+    let z: PtrWrapper<dyn Fn(u32) -> u32> =
+        coerce_ptr_wrapper_poly(PtrWrapper(2,3,(),&square_local));
+    assert_eq!((z.3)(6), 36);
+}

diff --git a/tests/run-pass/fat_ptr.rs b/tests/run-pass/fat_ptr.rs
new file mode 100644 (file)
index 0000000..55418c4
--- /dev/null
+++ b/tests/run-pass/fat_ptr.rs
@@ -0,0 +1,51 @@
+// test that ordinary fat pointer operations work.
+
+struct Wrapper<T: ?Sized>(u32, T);
+
+struct FatPtrContainer<'a> {
+    ptr: &'a [u8]
+}
+
+fn fat_ptr_project(a: &Wrapper<[u8]>) -> &[u8] {
+    &a.1
+}
+
+fn fat_ptr_simple(a: &[u8]) -> &[u8] {
+    a
+}
+
+fn fat_ptr_via_local(a: &[u8]) -> &[u8] {
+    let x = a;
+    x
+}
+
+fn fat_ptr_from_struct(s: FatPtrContainer) -> &[u8] {
+    s.ptr
+}
+
+fn fat_ptr_to_struct(a: &[u8]) -> FatPtrContainer {
+    FatPtrContainer { ptr: a }
+}
+
+fn fat_ptr_store_to<'a>(a: &'a [u8], b: &mut &'a [u8]) {
+    *b = a;
+}
+
+fn fat_ptr_constant() -> &'static str {
+    "HELLO"
+}
+
+fn main() {
+    let a = Wrapper(4, [7,6,5]);
+
+    let p = fat_ptr_project(&a);
+    let p = fat_ptr_simple(p);
+    let p = fat_ptr_via_local(p);
+    let p = fat_ptr_from_struct(fat_ptr_to_struct(p));
+
+    let mut target : &[u8] = &[42];
+    fat_ptr_store_to(p, &mut target);
+    assert_eq!(target, &a.1);
+
+    assert_eq!(fat_ptr_constant(), "HELLO");
+}

diff --git a/tests/run-pass/mir_coercions.rs b/tests/run-pass/mir_coercions.rs
deleted file mode 100644 (file)
index bfc821f..0000000
--- a/tests/run-pass/mir_coercions.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-#![feature(coerce_unsized, unsize)]
-
-use std::ops::CoerceUnsized;
-use std::marker::Unsize;
-
-fn identity_coercion(x: &(dyn Fn(u32)->u32 + Send)) -> &dyn Fn(u32)->u32 {
-    x
-}
-fn fn_coercions(f: &fn(u32) -> u32) ->
-    (unsafe fn(u32) -> u32,
-     &(dyn Fn(u32) -> u32 + Send))
-{
-    (*f, f)
-}
-
-fn simple_array_coercion(x: &[u8; 3]) -> &[u8] { x }
-
-fn square(a: u32) -> u32 { a * a }
-
-#[derive(PartialEq,Eq)]
-struct PtrWrapper<'a, T: 'a+?Sized>(u32, u32, (), &'a T);
-impl<'a, T: ?Sized+Unsize<U>, U: ?Sized>
-    CoerceUnsized<PtrWrapper<'a, U>> for PtrWrapper<'a, T> {}
-
-struct TrivPtrWrapper<'a, T: 'a+?Sized>(&'a T);
-impl<'a, T: ?Sized+Unsize<U>, U: ?Sized>
-    CoerceUnsized<TrivPtrWrapper<'a, U>> for TrivPtrWrapper<'a, T> {}
-
-fn coerce_ptr_wrapper(p: PtrWrapper<[u8; 3]>) -> PtrWrapper<[u8]> {
-    p
-}
-
-fn coerce_triv_ptr_wrapper(p: TrivPtrWrapper<[u8; 3]>) -> TrivPtrWrapper<[u8]> {
-    p
-}
-
-fn coerce_fat_ptr_wrapper(p: PtrWrapper<dyn Fn(u32) -> u32 + Send>)
-                          -> PtrWrapper<dyn Fn(u32) -> u32> {
-    p
-}
-
-fn coerce_ptr_wrapper_poly<'a, T, Trait: ?Sized>(p: PtrWrapper<'a, T>)
-                                                 -> PtrWrapper<'a, Trait>
-    where PtrWrapper<'a, T>: CoerceUnsized<PtrWrapper<'a, Trait>>
-{
-    p
-}
-
-fn main() {
-    let a = [0,1,2];
-    let square_local : fn(u32) -> u32 = square;
-    let (f,g) = fn_coercions(&square_local);
-    // cannot use `square as *const ()` because we can't know whether the compiler duplicates
-    // functions, so two function pointers are only equal if they result from the same function
-    // to function pointer cast
-    assert_eq!(f as *const (), square_local as *const());
-    assert_eq!(g(4), 16);
-    assert_eq!(identity_coercion(g)(5), 25);
-
-    assert_eq!(simple_array_coercion(&a), &a);
-    let w = coerce_ptr_wrapper(PtrWrapper(2,3,(),&a));
-    assert!(w == PtrWrapper(2,3,(),&a) as PtrWrapper<[u8]>);
-
-    let w = coerce_triv_ptr_wrapper(TrivPtrWrapper(&a));
-    assert_eq!(&w.0, &a);
-
-    let z = coerce_fat_ptr_wrapper(PtrWrapper(2,3,(),&square_local));
-    assert_eq!((z.3)(6), 36);
-
-    let z: PtrWrapper<dyn Fn(u32) -> u32> =
-        coerce_ptr_wrapper_poly(PtrWrapper(2,3,(),&square_local));
-    assert_eq!((z.3)(6), 36);
-}

diff --git a/tests/run-pass/mir_fat_ptr.rs b/tests/run-pass/mir_fat_ptr.rs
deleted file mode 100644 (file)
index 55418c4..0000000
--- a/tests/run-pass/mir_fat_ptr.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-// test that ordinary fat pointer operations work.
-
-struct Wrapper<T: ?Sized>(u32, T);
-
-struct FatPtrContainer<'a> {
-    ptr: &'a [u8]
-}
-
-fn fat_ptr_project(a: &Wrapper<[u8]>) -> &[u8] {
-    &a.1
-}
-
-fn fat_ptr_simple(a: &[u8]) -> &[u8] {
-    a
-}
-
-fn fat_ptr_via_local(a: &[u8]) -> &[u8] {
-    let x = a;
-    x
-}
-
-fn fat_ptr_from_struct(s: FatPtrContainer) -> &[u8] {
-    s.ptr
-}
-
-fn fat_ptr_to_struct(a: &[u8]) -> FatPtrContainer {
-    FatPtrContainer { ptr: a }
-}
-
-fn fat_ptr_store_to<'a>(a: &'a [u8], b: &mut &'a [u8]) {
-    *b = a;
-}
-
-fn fat_ptr_constant() -> &'static str {
-    "HELLO"
-}
-
-fn main() {
-    let a = Wrapper(4, [7,6,5]);
-
-    let p = fat_ptr_project(&a);
-    let p = fat_ptr_simple(p);
-    let p = fat_ptr_via_local(p);
-    let p = fat_ptr_from_struct(fat_ptr_to_struct(p));
-
-    let mut target : &[u8] = &[42];
-    fat_ptr_store_to(p, &mut target);
-    assert_eq!(target, &a.1);
-
-    assert_eq!(fat_ptr_constant(), "HELLO");
-}