Fix tests for DynSized

Author: plietar

src/test/compile-fail/auxiliary/tdticc_coherence_lib.rs

@@ -8,10 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(optin_builtin_traits, core)]
+#![feature(dynsized, optin_builtin_traits)]
 #![crate_type = "rlib"]
 
-pub trait DefaultedTrait { }
+use std::marker::DynSized;
+
+pub trait DefaultedTrait: ?DynSized { }
 impl DefaultedTrait for .. { }
 
 pub struct Something<T> { t: T }

src/test/compile-fail/extern-types-not-sync-send.rs

@@ -10,14 +10,16 @@
 
 // Make sure extern types are !Sync and !Send.
 
-#![feature(extern_types)]
+#![feature(dynsized, extern_types)]
+
+use std::marker::DynSized;
 
 extern {
     type A;
 }
 
-fn assert_sync<T: ?Sized + Sync>() { }
-fn assert_send<T: ?Sized + Send>() { }
+fn assert_sync<T: ?DynSized + Sync>() { }
+fn assert_send<T: ?DynSized + Send>() { }
 
 fn main() {
     assert_sync::<A>();

src/test/compile-fail/extern-types-unsized.rs

@@ -8,36 +8,21 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Make sure extern types are !Sized.
+// Make sure extern types are !Sized and !DynSized.
 
 #![feature(extern_types)]
 
 extern {
     type A;
 }
 
-struct Foo {
-    x: u8,
-    tail: A,
-}
-
-struct Bar<T: ?Sized> {
-    x: u8,
-    tail: T,
-}
-
 fn assert_sized<T>() { }
+fn assert_dynsized<T: ?Sized>() { }
 
 fn main() {
     assert_sized::<A>();
     //~^ ERROR the trait bound `A: std::marker::Sized` is not satisfied
 
-    assert_sized::<Foo>();
-    //~^ ERROR the trait bound `A: std::marker::Sized` is not satisfied
-
-    assert_sized::<Bar<A>>();
-    //~^ ERROR the trait bound `A: std::marker::Sized` is not satisfied
-
-    assert_sized::<Bar<Bar<A>>>();
-    //~^ ERROR the trait bound `A: std::marker::Sized` is not satisfied
+    assert_dynsized::<A>();
+    //~^ ERROR the trait bound `A: std::marker::DynSized` is not satisfied
 }

src/test/compile-fail/maybe-bounds.rs

@@ -8,10 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-trait Tr: ?Sized {} //~ ERROR `?Trait` is not permitted in supertraits
+#![feature(dynsized)]
+
+use std::marker::DynSized;
+
+trait Tr: ?Sized {} //~ ERROR `?Sized` is not permitted in supertraits
                     //~^ NOTE traits are `?Sized` by default
 
 type A1 = Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types
-type A2 = for<'a> Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types
+type A2 = Tr + ?DynSized; //~ ERROR `?Trait` is not permitted in trait object types
+type A3 = for<'a> Tr + ?Sized; //~ ERROR `?Trait` is not permitted in trait object types
 
 fn main() {}

src/test/compile-fail/phantom-oibit.rs

@@ -12,11 +12,11 @@
 // the `PhantomData<T>` type itself (which almost always implements a "default" trait
 // (`impl Trait for ..`))
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-use std::marker::{PhantomData};
+use std::marker::{DynSized, PhantomData};
 
-unsafe trait Zen {}
+unsafe trait Zen: ?DynSized {}
 
 unsafe impl Zen for .. {}
 

src/test/compile-fail/privacy-sanity.rs

@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-trait MarkerTr {}
+use std::marker::DynSized;
+
+trait MarkerTr: ?DynSized {}
 pub trait Tr {
     fn f();
     const C: u8;
@@ -38,7 +40,7 @@ pub extern "C" { //~ ERROR unnecessary visibility qualifier
 }
 
 const MAIN: u8 = {
-    trait MarkerTr {}
+    trait MarkerTr: ?DynSized {}
     pub trait Tr {
         fn f();
         const C: u8;
@@ -69,7 +71,7 @@ const MAIN: u8 = {
 };
 
 fn main() {
-    trait MarkerTr {}
+    trait MarkerTr: ?DynSized {}
     pub trait Tr {
         fn f();
         const C: u8;

src/test/compile-fail/typeck-default-trait-impl-constituent-types-2.rs

@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-trait MyTrait {}
+use std::marker::DynSized;
+
+trait MyTrait: ?DynSized {}
 
 impl MyTrait for .. {}
 

src/test/compile-fail/typeck-default-trait-impl-constituent-types.rs

@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-trait MyTrait {}
+use std::marker::DynSized;
+
+trait MyTrait: ?DynSized {}
 
 impl MyTrait for .. {}
 impl<T> !MyTrait for *mut T {}

src/test/compile-fail/typeck-default-trait-impl-negation.rs

@@ -8,13 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-trait MyTrait {}
+use std::marker::DynSized;
+
+trait MyTrait: ?DynSized {}
 
 impl MyTrait for .. {}
 
-unsafe trait MyUnsafeTrait {}
+unsafe trait MyUnsafeTrait: ?DynSized {}
 
 unsafe impl MyUnsafeTrait for .. {}
 

src/test/compile-fail/typeck-default-trait-impl-precedence.rs

@@ -13,9 +13,11 @@
 // other words, the `..` impl only applies if there are no existing
 // impls whose types unify.
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-trait Defaulted { }
+use std::marker::DynSized;
+
+trait Defaulted: ?DynSized { }
 impl Defaulted for .. { }
 impl<'a,T:Signed> Defaulted for &'a T { }
 impl<'a,T:Signed> Defaulted for &'a mut T { }

src/test/run-pass/extern-types-manual-sync-send.rs

@@ -10,7 +10,9 @@
 
 // Test that unsafe impl for Sync/Send can be provided for extern types.
 
-#![feature(extern_types)]
+#![feature(dynsized, extern_types)]
+
+use std::marker::DynSized;
 
 extern {
     type A;
@@ -19,8 +21,8 @@ extern {
 unsafe impl Sync for A { }
 unsafe impl Send for A { }
 
-fn assert_sync<T: ?Sized + Sync>() { }
-fn assert_send<T: ?Sized + Send>() { }
+fn assert_sync<T: ?DynSized + Sync>() { }
+fn assert_send<T: ?DynSized + Send>() { }
 
 fn main() {
     assert_sync::<A>();

src/test/run-pass/extern-types-pointer-cast.rs

@@ -17,24 +17,11 @@ extern {
     type A;
 }
 
-struct Foo {
-    x: u8,
-    tail: A,
-}
-
-struct Bar<T: ?Sized> {
-    x: u8,
-    tail: T,
-}
-
 #[cfg(target_pointer_width = "32")]
 const MAGIC: usize = 0xdeadbeef;
 #[cfg(target_pointer_width = "64")]
 const MAGIC: usize = 0x12345678deadbeef;
 
 fn main() {
     assert_eq!((MAGIC as *const A) as usize, MAGIC);
-    assert_eq!((MAGIC as *const Foo) as usize, MAGIC);
-    assert_eq!((MAGIC as *const Bar<A>) as usize, MAGIC);
-    assert_eq!((MAGIC as *const Bar<Bar<A>>) as usize, MAGIC);
 }

src/test/run-pass/extern-types-size_of_val.rs

@@ -19,33 +19,16 @@ extern {
     type A;
 }
 
-struct Foo {
-    x: u8,
-    tail: A,
-}
-
-struct Bar<T: ?Sized> {
-    x: u8,
-    tail: T,
-}
-
-fn assert_thin<T: ?Sized>() {
-    assert_eq!(size_of::<*const T>(), size_of::<*const ()>());
-    assert_eq!(align_of::<*const T>(), align_of::<*const ()>());
-
-    assert_eq!(size_of::<*mut T>(), size_of::<*mut ()>());
-    assert_eq!(align_of::<*mut T>(), align_of::<*mut ()>());
+fn main() {
+    assert_eq!(size_of::<*const A>(), size_of::<*const ()>());
+    assert_eq!(align_of::<*const A>(), align_of::<*const ()>());
 
-    assert_eq!(size_of::<&T>(), size_of::<&()>());
-    assert_eq!(align_of::<&T>(), align_of::<&()>());
+    assert_eq!(size_of::<*mut A>(), size_of::<*mut ()>());
+    assert_eq!(align_of::<*mut A>(), align_of::<*mut ()>());
 
-    assert_eq!(size_of::<&mut T>(), size_of::<&mut ()>());
-    assert_eq!(align_of::<&mut T>(), align_of::<&mut ()>());
-}
+    assert_eq!(size_of::<&A>(), size_of::<&()>());
+    assert_eq!(align_of::<&A>(), align_of::<&()>());
 
-fn main() {
-    assert_thin::<A>();
-    assert_thin::<Foo>();
-    assert_thin::<Bar<A>>();
-    assert_thin::<Bar<Bar<A>>>();
+    assert_eq!(size_of::<&mut A>(), size_of::<&mut ()>());
+    assert_eq!(align_of::<&mut A>(), align_of::<&mut ()>());
 }

src/test/run-pass/extern-types-thin-pointer.rs

@@ -8,9 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(optin_builtin_traits)]
+#![feature(dynsized, optin_builtin_traits)]
 
-trait NotSame {}
+use std::marker::DynSized;
+
+trait NotSame: ?DynSized {}
 impl NotSame for .. {}
 impl<A> !NotSame for (A, A) {}
 

src/test/run-pass/issue-29516.rs

@@ -7,14 +7,6 @@ error[E0277]: the trait bound `[i32]: Index<u32>` is not satisfied
    = help: the trait `Index<u32>` is not implemented for `[i32]`
    = note: required by `Index::index`
 
-error[E0277]: the trait bound `[i32]: Index<u32>` is not satisfied
-  --> $DIR/multiple-impls.rs:43:5
-   |
-43 |     Index::index(&[] as &[i32], 2u32);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ trait message
-   |
-   = help: the trait `Index<u32>` is not implemented for `[i32]`
-
 error[E0277]: the trait bound `[i32]: Index<Foo<u32>>` is not satisfied
   --> $DIR/multiple-impls.rs:49:5
    |
@@ -24,14 +16,6 @@ error[E0277]: the trait bound `[i32]: Index<Foo<u32>>` is not satisfied
    = help: the trait `Index<Foo<u32>>` is not implemented for `[i32]`
    = note: required by `Index::index`
 
-error[E0277]: the trait bound `[i32]: Index<Foo<u32>>` is not satisfied
-  --> $DIR/multiple-impls.rs:49:5
-   |
-49 |     Index::index(&[] as &[i32], Foo(2u32));
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ on impl for Foo
-   |
-   = help: the trait `Index<Foo<u32>>` is not implemented for `[i32]`
-
 error[E0277]: the trait bound `[i32]: Index<Bar<u32>>` is not satisfied
   --> $DIR/multiple-impls.rs:55:5
    |
@@ -41,13 +25,5 @@ error[E0277]: the trait bound `[i32]: Index<Bar<u32>>` is not satisfied
    = help: the trait `Index<Bar<u32>>` is not implemented for `[i32]`
    = note: required by `Index::index`
 
-error[E0277]: the trait bound `[i32]: Index<Bar<u32>>` is not satisfied
-  --> $DIR/multiple-impls.rs:55:5
-   |
-55 |     Index::index(&[] as &[i32], Bar(2u32));
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ on impl for Bar
-   |
-   = help: the trait `Index<Bar<u32>>` is not implemented for `[i32]`
-
-error: aborting due to 6 previous errors
+error: aborting due to 3 previous errors
 

src/test/ui/on-unimplemented/multiple-impls.stderr

@@ -7,13 +7,5 @@ error[E0277]: the trait bound `[i32]: Index<u32>` is not satisfied
    = help: the trait `Index<u32>` is not implemented for `[i32]`
    = note: required by `Index::index`
 
-error[E0277]: the trait bound `[i32]: Index<u32>` is not satisfied
-  --> $DIR/on-impl.rs:32:5
-   |
-32 |     Index::<u32>::index(&[1, 2, 3] as &[i32], 2u32);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ a usize is required to index into a slice
-   |
-   = help: the trait `Index<u32>` is not implemented for `[i32]`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error