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

3 files changed, 3 insertions, 3 deletions

diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs
index a4bafe754ff..63bf9ec3314 100644
--- a/src/libcoretest/hash/mod.rs
+++ b/src/libcoretest/hash/mod.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-use core::kinds::Sized;
+use core::marker::Sized;
 use std::mem;
 
 use core::slice::SliceExt;
diff --git a/src/libcoretest/num/mod.rs b/src/libcoretest/num/mod.rs
index 9be7917e0a0..8186a4f0904 100644
--- a/src/libcoretest/num/mod.rs
+++ b/src/libcoretest/num/mod.rs
@@ -12,7 +12,7 @@ use core::cmp::PartialEq;
 use core::fmt::Show;
 use core::num::{NumCast, cast};
 use core::ops::{Add, Sub, Mul, Div, Rem};
-use core::kinds::Copy;
+use core::marker::Copy;
 
 #[macro_use]
 mod int_macros;
diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs
index 4a459992098..1169f910238 100644
--- a/src/libcoretest/option.rs
+++ b/src/libcoretest/option.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use core::option::*;
-use core::kinds::marker;
+use core::marker;
 use core::mem;
 use core::clone::Clone;