fix fallout

Author: Jorge Aparicio

src/doc/reference.md

@@ -1705,6 +1705,7 @@ specific type.
 Implementations are defined with the keyword `impl`.
 
 ```
+# use std::marker::Pod;
 # #[derive(Copy)]
 # struct Point {x: f64, y: f64};
 # type Surface = i32;
@@ -1716,6 +1717,7 @@ struct Circle {
     center: Point,
 }
 
+impl Pod for Circle {}
 impl Copy for Circle {}
 
 impl Shape for Circle {

src/libcollections/enum_set.rs

@@ -31,6 +31,8 @@ pub struct EnumSet<E> {
     marker: marker::PhantomData<E>,
 }
 
+#[cfg(not(stage0))]
+impl<E> marker::Pod for EnumSet<E> {}
 impl<E> Copy for EnumSet<E> {}
 
 #[stable(feature = "rust1", since = "1.0.0")]

src/libcollections/linked_list.rs

@@ -31,6 +31,8 @@ use core::hash::{Hasher, Hash};
 use core::iter::{self, FromIterator, IntoIterator};
 use core::mem;
 use core::ptr;
+#[cfg(not(stage0))]
+use core::marker::Pod;
 
 #[deprecated(since = "1.0.0", reason = "renamed to LinkedList")]
 #[unstable(feature = "collections")]
@@ -50,6 +52,8 @@ struct Rawlink<T> {
     p: *mut T,
 }
 
+#[cfg(not(stage0))]
+impl<T> Pod for Rawlink<T> {}
 impl<T> Copy for Rawlink<T> {}
 unsafe impl<T:Send> Send for Rawlink<T> {}
 unsafe impl<T:Sync> Sync for Rawlink<T> {}

src/libcore/marker.rs

@@ -273,6 +273,8 @@ macro_rules! impls{
             }
         }
 
+        #[cfg(not(stage0))]
+        impl<T:?Sized> Pod for $t<T> { }
         impl<T:?Sized> Copy for $t<T> { }
 
         impl<T:?Sized> Clone for $t<T> {

src/libcore/raw.rs

@@ -19,6 +19,8 @@
 //! Their definition should always match the ABI defined in `rustc::back::abi`.
 
 use marker::Copy;
+#[cfg(not(stage0))]
+use marker::Pod;
 use mem;
 
 /// The representation of a slice like `&[T]`.
@@ -62,6 +64,8 @@ pub struct Slice<T> {
 }
 
 impl<T> Copy for Slice<T> {}
+#[cfg(not(stage0))]
+impl<T> Pod for Slice<T> {}
 
 /// The representation of an old closure.
 #[repr(C)]

src/librustc/middle/mem_categorization.rs

@@ -86,6 +86,8 @@ use syntax::print::pprust;
 use syntax::parse::token;
 
 use std::cell::RefCell;
+#[cfg(not(stage0))]
+use std::marker::Pod;
 use std::rc::Rc;
 
 #[derive(Clone, PartialEq, Debug)]
@@ -260,6 +262,8 @@ pub struct MemCategorizationContext<'t,TYPER:'t> {
     typer: &'t TYPER
 }
 
+#[cfg(not(stage0))]
+impl<'t,TYPER:'t> Pod for MemCategorizationContext<'t,TYPER> {}
 impl<'t,TYPER:'t> Copy for MemCategorizationContext<'t,TYPER> {}
 
 pub type McResult<T> = Result<T, ()>;

src/librustc_llvm/diagnostic.rs

@@ -69,14 +69,13 @@ impl OptimizationDiagnostic {
     }
 }
 
+#[derive(Copy)]
 pub struct InlineAsmDiagnostic {
     pub cookie: c_uint,
     pub message: TwineRef,
     pub instruction: ValueRef,
 }
 
-impl Copy for InlineAsmDiagnostic {}
-
 impl InlineAsmDiagnostic {
     unsafe fn unpack(di: DiagnosticInfoRef)
             -> InlineAsmDiagnostic {

src/libstd/collections/hash/table.rs

@@ -17,6 +17,8 @@ use cmp;
 use hash::{Hash, Hasher};
 use iter::{Iterator, IteratorExt, ExactSizeIterator, count};
 use marker::{Copy, Send, Sync, Sized, self};
+#[cfg(not(stage0))]
+use marker::Pod;
 use mem::{min_align_of, size_of};
 use mem;
 use num::{Int, UnsignedInt};
@@ -87,6 +89,8 @@ struct RawBucket<K, V> {
     _marker: marker::PhantomData<(K,V)>,
 }
 
+#[cfg(not(stage0))]
+impl<K,V> Pod for RawBucket<K,V> {}
 impl<K,V> Copy for RawBucket<K,V> {}
 
 pub struct Bucket<K, V, M> {
@@ -95,6 +99,9 @@ pub struct Bucket<K, V, M> {
     table: M
 }
 
+// XXX(japaric) needs auditing
+#[cfg(not(stage0))]
+impl<K,V,M:Copy> Pod for Bucket<K,V,M> {}
 impl<K,V,M:Copy> Copy for Bucket<K,V,M> {}
 
 pub struct EmptyBucket<K, V, M> {

src/test/compile-fail/exclusive-drop-and-copy.rs

@@ -12,14 +12,14 @@
 
 // issue #20126
 
-#[derive(Copy)] //~ ERROR the trait `Copy` may not be implemented
+#[derive(Copy)] //~ ERROR the trait `Pod` may not be implemented
 struct Foo;
 
 impl Drop for Foo {
     fn drop(&mut self) {}
 }
 
-#[derive(Copy)] //~ ERROR the trait `Copy` may not be implemented
+#[derive(Copy)] //~ ERROR the trait `Pod` may not be implemented
 struct Bar<T>(::std::marker::PhantomData<T>);
 
 #[unsafe_destructor]

src/test/compile-fail/opt-in-copy.rs

@@ -15,7 +15,7 @@ struct IWantToCopyThis {
 }
 
 impl Copy for IWantToCopyThis {}
-//~^ ERROR the trait `Copy` may not be implemented for this type
+//~^ ERROR the trait `core::marker::Pod` is not implemented
 
 enum CantCopyThisEither {
     A,
@@ -27,7 +27,7 @@ enum IWantToCopyThisToo {
 }
 
 impl Copy for IWantToCopyThisToo {}
-//~^ ERROR the trait `Copy` may not be implemented for this type
+//~^ ERROR the trait `core::marker::Pod` is not implemented
 
 fn main() {}
 

src/test/run-make/simd-ffi/simd.rs

@@ -75,12 +75,16 @@ pub trait Sized : PhantomFn<Self> {}
 #[lang = "copy"]
 pub trait Copy : PhantomFn<Self> {}
 
+#[lang = "pod"]
+pub trait Pod : PhantomFn<Self> {}
+
 #[lang="phantom_fn"]
 pub trait PhantomFn<A:?Sized,R:?Sized=()> { }
 impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
 
 mod core {
     pub mod marker {
         pub use Copy;
+        pub use Pod;
     }
 }

src/test/run-pass/copy-out-of-array-1.rs

@@ -12,8 +12,11 @@
 //
 // (Compare with compile-fail/move-out-of-array-1.rs)
 
+use std::marker::Pod;
+
 struct C { _x: u8 }
 
+impl Pod for C { }
 impl Copy for C { }
 
 fn main() {

src/test/run-pass/issue-22536-copy-mustnt-zero.rs

@@ -11,6 +11,8 @@
 // Regression test for Issue #22536: If a type implements Copy, then
 // moving it must not zero the original memory.
 
+use std::marker::Pod;
+
 trait Resources {
     type Buffer: Copy;
     fn foo(&self) {}
@@ -19,12 +21,14 @@ trait Resources {
 struct BufferHandle<R: Resources> {
     raw: <R as Resources>::Buffer,
 }
+impl<R: Resources> Pod for BufferHandle<R> {}
 impl<R: Resources> Copy for BufferHandle<R> {}
 
 enum Res {}
 impl Resources for Res {
     type Buffer = u32;
 }
+impl Pod for Res { }
 impl Copy for Res { }
 
 fn main() {

src/test/run-pass/regions-early-bound-used-in-bound.rs

@@ -11,6 +11,8 @@
 // Tests that you can use a fn lifetime parameter as part of
 // the value for a type parameter in a bound.
 
+use std::marker::Pod;
+
 trait GetRef<'a, T> {
     fn get(&self) -> &'a T;
 }
@@ -19,6 +21,7 @@ struct Box<'a, T:'a> {
     t: &'a T
 }
 
+impl<'a,T:'a> Pod for Box<'a,T> {}
 impl<'a,T:'a> Copy for Box<'a,T> {}
 
 impl<'a,T:Clone> GetRef<'a,T> for Box<'a,T> {