rollup merge of #20607: nrc/kinds

Conflicts:
	src/libcore/array.rs
	src/libcore/cell.rs
	src/libcore/prelude.rs
	src/libstd/path/posix.rs
	src/libstd/prelude/v1.rs
	src/test/compile-fail/dst-sized-trait-param.rs

5 files changed, 8 insertions, 6 deletions

diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs
index 0a6551bf41a..350f33360d5 100644
--- a/src/libcollections/btree/map.rs
+++ b/src/libcollections/btree/map.rs
@@ -480,7 +480,7 @@ enum Continuation<A, B> {
 /// boilerplate gets cut out.
 mod stack {
     use core::prelude::*;
-    use core::kinds::marker;
+    use core::marker;
     use core::mem;
     use core::ops::{Deref, DerefMut};
     use super::BTreeMap;
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 64005e89dde..d2eaaade7b6 100644
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -99,7 +99,9 @@ mod std {
     pub use core::option;   // necessary for panic!()
     pub use core::clone;    // deriving(Clone)
     pub use core::cmp;      // deriving(Eq, Ord, etc.)
-    pub use core::kinds;    // deriving(Copy)
+    #[cfg(stage0)]
+    pub use core::marker as kinds;
+    pub use core::marker;  // deriving(Copy)
     pub use core::hash;     // deriving(Hash)
 }
 
@@ -114,7 +116,7 @@ mod prelude {
     pub use core::iter::{FromIterator, Extend, IteratorExt};
     pub use core::iter::{Iterator, DoubleEndedIterator, RandomAccessIterator};
     pub use core::iter::{ExactSizeIterator};
-    pub use core::kinds::{Copy, Send, Sized, Sync};
+    pub use core::marker::{Copy, Send, Sized, Sync};
     pub use core::mem::drop;
     pub use core::ops::{Drop, Fn, FnMut, FnOnce};
     pub use core::option::Option;
diff --git a/src/libcollections/ring_buf.rs b/src/libcollections/ring_buf.rs
index 9374d42b2c7..7c4db989296 100644
--- a/src/libcollections/ring_buf.rs
+++ b/src/libcollections/ring_buf.rs
@@ -20,7 +20,7 @@ use core::cmp::Ordering;
 use core::default::Default;
 use core::fmt;
 use core::iter::{self, repeat, FromIterator, RandomAccessIterator};
-use core::kinds::marker;
+use core::marker;
 use core::mem;
 use core::num::{Int, UnsignedInt};
 use core::ops::{Index, IndexMut};
diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs
index 95b0a16d4c5..582887ac38a 100644
--- a/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@ -95,7 +95,7 @@ use core::cmp::Ordering::{self, Greater, Less};
 use core::cmp::{self, Ord, PartialEq};
 use core::iter::{Iterator, IteratorExt};
 use core::iter::{range, range_step, MultiplicativeIterator};
-use core::kinds::Sized;
+use core::marker::Sized;
 use core::mem::size_of;
 use core::mem;
 use core::ops::{FnMut, FullRange, Index, IndexMut};
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index a3f7f6c9157..07c33638a1b 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -55,7 +55,7 @@ use core::default::Default;
 use core::fmt;
 use core::hash::{self, Hash};
 use core::iter::{repeat, FromIterator};
-use core::kinds::marker::{ContravariantLifetime, InvariantType};
+use core::marker::{ContravariantLifetime, InvariantType};
 use core::mem;
 use core::nonzero::NonZero;
 use core::num::{Int, UnsignedInt};