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

diff --cc src/liballoc/arc.rs
Simple merge

diff --cc src/liballoc/boxed.rs
Simple merge

diff --cc src/liballoc/rc.rs
Simple merge

diff --cc src/libcollections/btree/map.rs
Simple merge

diff --cc src/libcollections/lib.rs
Simple merge

diff --cc src/libcollections/ring_buf.rs
Simple merge

diff --cc src/libcollections/slice.rs
index 95b0a16d4c5e0b43280e0eca37772badef3cb311,6acb75387fdc3154f79cf25ccf02a2153a1cf9bf..582887ac38a532de06df7893aab234bac72fb745
--- 1/src/libcollections/slice.rs
--- 2/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@@ -95,10 -95,10 +95,10 @@@ use core::cmp::Ordering::{self, Greater
  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, SliceMut};
 +use core::ops::{FnMut, FullRange, Index, IndexMut};
  use core::option::Option::{self, Some, None};
  use core::ptr::PtrExt;
  use core::ptr;

diff --cc src/libcollections/vec.rs
Simple merge

diff --cc src/libcore/array.rs
index a4b32f2b6a2cdf29461af3b176daeb237376346e,2013c398c5542c7778c79579d7cec3293566aef2..05db9e11760e38615889566361962de4f954993d
--- 1/src/libcore/array.rs
--- 2/src/libcore/array.rs
+++ b/src/libcore/array.rs
@@@ -17,8 -17,8 +17,8 @@@
  use clone::Clone;
  use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering};
  use fmt;
- use kinds::Copy;
+ use marker::Copy;
 -use ops::Deref;
 +use ops::{Deref, FullRange, Index};
  use option::Option;
  
  // macro for implementing n-ary tuple functions and operations

diff --cc src/libcore/borrow.rs
Simple merge

diff --cc src/libcore/cell.rs
index 3cc197c323c1d10e7e46d61e22b9ea68e746fdb7,7217468c74ed962e8ed6dc32ecbeda58fdc212d0..674364269f1da0bcb0573f6d05be3e12a1a36761
--- 1/src/libcore/cell.rs
--- 2/src/libcore/cell.rs
+++ b/src/libcore/cell.rs
@@@ -160,7 -160,8 +160,7 @@@
  use clone::Clone;
  use cmp::PartialEq;
  use default::Default;
- use kinds::{Copy, Send};
 -use fmt;
+ use marker::{Copy, Send};
  use ops::{Deref, DerefMut, Drop};
  use option::Option;
  use option::Option::{None, Some};

diff --cc src/libcore/fmt/mod.rs
index fdd758cedac835e6bd5f89e4e065f5244be474f8,c7ff0f938b667f370b8ab458fc8e644e0e96b294..e44c001cc40f20fe44556d10b3a2d7c39c59535e
--- 1/src/libcore/fmt/mod.rs
--- 2/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@@ -13,10 -13,9 +13,10 @@@
  #![allow(unused_variables)]
  
  use any;
 -use cell::{Cell, Ref, RefMut};
 +use cell::{Cell, RefCell, Ref, RefMut};
 +use char::CharExt;
  use iter::{Iterator, IteratorExt, range};
- use kinds::{Copy, Sized};
+ use marker::{Copy, Sized};
  use mem;
  use option::Option;
  use option::Option::{Some, None};

diff --cc src/libcore/lib.rs
Simple merge

diff --cc src/libcore/num/mod.rs
index 3bcdd54463fc6e312d92201a1b296ad376da980f,046406ee4d976fe51e048c8bc101a2e86a9027d3..490d8111f463ad3d14e319969734b5a21003c9b8
--- 1/src/libcore/num/mod.rs
--- 2/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@@ -21,10 -21,10 +21,10 @@@ use cmp::{PartialEq, Eq}
  use cmp::{PartialOrd, Ord};
  use intrinsics;
  use iter::IteratorExt;
- use kinds::Copy;
+ use marker::Copy;
  use mem::size_of;
  use ops::{Add, Sub, Mul, Div, Rem, Neg};
 -use ops::{Not, BitAnd, BitOr, BitXor, Shl, Shr};
 +use ops::{Not, BitAnd, BitOr, BitXor, Shl, Shr, Index};
  use option::Option;
  use option::Option::{Some, None};
  use str::{FromStr, StrExt};

diff --cc src/libcore/ops.rs
Simple merge

diff --cc src/libcore/prelude.rs
index a560b68db01fa89cf50098f2f9e5f1d4e792ea16,c175b83e7609a524c3ce36820b0610a2dc21791d..c3bb9c91557f334da2485f25d9b896abecfc2ae7
--- 1/src/libcore/prelude.rs
--- 2/src/libcore/prelude.rs
+++ b/src/libcore/prelude.rs
@@@ -29,8 -29,8 +29,8 @@@
  //! ```
  
  // Reexported core operators
- pub use kinds::{Copy, Send, Sized, Sync};
+ pub use marker::{Copy, Send, Sized, Sync};
 -pub use ops::{Drop, Fn, FnMut, FnOnce};
 +pub use ops::{Drop, Fn, FnMut, FnOnce, FullRange};
  
  // Reexported functions
  pub use iter::range;

diff --cc src/libcore/slice.rs
index 8ab927f701a1ecd84b3f5c25ad3b6339516ca309,3d55d09ccf125faf266321e657466dcd759a82c7..d197cb58a582b35691537e2801ca78ede935a704
--- 1/src/libcore/slice.rs
--- 2/src/libcore/slice.rs
+++ b/src/libcore/slice.rs
@@@ -41,9 -41,9 +41,9 @@@ use cmp::Ordering::{Less, Equal, Greate
  use cmp;
  use default::Default;
  use iter::*;
- use kinds::Copy;
+ use marker::Copy;
  use num::Int;
 -use ops::{FnMut, self};
 +use ops::{FnMut, self, Index};
  use option::Option;
  use option::Option::{None, Some};
  use result::Result;

diff --cc src/libcore/str/mod.rs
index 4d160c35577528ebfe8624e43f50c8cbd29a4865,d9db50b0d5a967a978dca7c30e95734f8568f777..d633f822ff7bfb910c6dcdcb4ecc15df53b4c81d
--- 1/src/libcore/str/mod.rs
--- 2/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@@ -23,10 -23,10 +23,10 @@@ use default::Default
  use iter::range;
  use iter::ExactSizeIterator;
  use iter::{Map, Iterator, IteratorExt, DoubleEndedIterator};
- use kinds::Sized;
+ use marker::Sized;
  use mem;
  use num::Int;
 -use ops::{Fn, FnMut};
 +use ops::{Fn, FnMut, Index};
  use option::Option::{self, None, Some};
  use ptr::PtrExt;
  use raw::{Repr, Slice};

diff --cc src/libcoretest/num/mod.rs
index 9be7917e0a0ef1422f5c9e9aba57580e9f3e8bb9,1e8d2d4bc610d0cdfde01403c6f654bb08a2a84b..8186a4f0904afe8fe39d0eeee5066034c990e29b
--- 1/src/libcoretest/num/mod.rs
--- 2/src/libcoretest/num/mod.rs
+++ b/src/libcoretest/num/mod.rs
@@@ -12,9 -12,10 +12,9 @@@ 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;
  
 -#[cfg_attr(stage0, macro_escape)]
 -#[cfg_attr(not(stage0), macro_use)]
 +#[macro_use]
  mod int_macros;
  
  mod i8;

diff --cc src/liblibc/lib.rs
Simple merge

diff --cc src/librand/lib.rs
Simple merge

diff --cc src/librustc/middle/expr_use_visitor.rs
Simple merge

diff --cc src/librustc/middle/infer/unify.rs
Simple merge

diff --cc src/librustc_typeck/variance.rs
Simple merge

diff --cc src/libstd/collections/hash/map.rs
Simple merge

diff --cc src/libstd/collections/hash/set.rs
Simple merge

diff --cc src/libstd/io/mod.rs
index dc9dd7071b1b0f442c5843ee65c326d9e2bd485c,b9c7ab15313501b42d216f85c287bdd2447b35b3..576e9ee77d653ab492e4c0efac904323b557e321
--- 1/src/libstd/io/mod.rs
--- 2/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@@ -232,9 -232,9 +232,9 @@@ use error::{FromError, Error}
  use fmt;
  use int;
  use iter::{Iterator, IteratorExt};
- use kinds::Sized;
+ use marker::Sized;
  use mem::transmute;
 -use ops::FnOnce;
 +use ops::{FnOnce, Index};
  use option::Option;
  use option::Option::{Some, None};
  use os;

diff --cc src/libstd/io/stdio.rs
Simple merge

diff --cc src/libstd/lib.rs
Simple merge

diff --cc src/libstd/os.rs
Simple merge

diff --cc src/libstd/path/mod.rs
Simple merge

diff --cc src/libstd/path/posix.rs
index 7c5455ed3fc1ce8199e0c654720d93f22bbbb9f1,d8bb989e19f140a7b6baa94b6ccce80d65fb6fff..a307132810e4cc43f1e8dc5deb23100a020dfbb2
--- 1/src/libstd/path/posix.rs
--- 2/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@@ -17,8 -16,7 +17,8 @@@ use hash
  use io::Writer;
  use iter::{AdditiveIterator, Extend};
  use iter::{Iterator, IteratorExt, Map};
- use prelude::v1::Index;
- use kinds::Sized;
++use ops::Index;
+ use marker::Sized;
  use option::Option::{self, Some, None};
  use slice::{AsSlice, Split, SliceExt, SliceConcatExt};
  use str::{self, FromStr, StrExt};

diff --cc src/libstd/prelude/v1.rs
index d0dcf77002ff4101997eaedcff36a85aae98c319,1aab52edd8e0ee75fbbaab5f5c9aa176fe2607fc..06a9303e0d7a551903c461b167f60c55567a2bd3
--- 1/src/libstd/prelude/v1.rs
--- 2/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@@ -13,9 -13,8 +13,8 @@@
  #![stable]
  
  // Reexported core operators
- #[stable] #[doc(no_inline)] pub use kinds::{Copy, Send, Sized, Sync};
+ #[stable] #[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync};
 -#[stable] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce};
 +#[stable] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce, FullRange};
- #[unstable] #[doc(no_inline)] pub use ops::{Index, IndexMut};
  
  // Reexported functions
  #[stable] #[doc(no_inline)] pub use mem::drop;

diff --cc src/libstd/rand/os.rs
Simple merge

diff --cc src/libstd/rt/mod.rs
Simple merge

diff --cc src/libstd/thread_local/mod.rs
Simple merge

diff --cc src/libsyntax/ext/deriving/bounds.rs
Simple merge

diff --cc src/test/compile-fail/dst-sized-trait-param.rs
index a65ca8b84f89341c6a1edbad3c5829fb45e01d0a,d68d6676515d0453221934976189099e11a137cb..3436c8d488c70710743c00bedae0a006a548f3df
--- 1/src/test/compile-fail/dst-sized-trait-param.rs
--- 2/src/test/compile-fail/dst-sized-trait-param.rs
+++ b/src/test/compile-fail/dst-sized-trait-param.rs
@@@ -14,10 -14,10 +14,10 @@@
  
  trait Foo<T> : Sized { fn take(self, x: &T) { } } // Note: T is sized
  
- impl Foo<[isize]> for uint { }
- //~^ ERROR the trait `core::kinds::Sized` is not implemented for the type `[isize]`
 -impl Foo<[int]> for uint { }
 -//~^ ERROR the trait `core::marker::Sized` is not implemented for the type `[int]`
++impl Foo<[isize]> for usize { }
++//~^ ERROR the trait `core::marker::Sized` is not implemented for the type `[isize]`
  
 -impl Foo<int> for [uint] { }
 -//~^ ERROR the trait `core::marker::Sized` is not implemented for the type `[uint]`
 +impl Foo<isize> for [usize] { }
- //~^ ERROR the trait `core::kinds::Sized` is not implemented for the type `[usize]`
++//~^ ERROR the trait `core::marker::Sized` is not implemented for the type `[usize]`
  
  pub fn main() { }

diff --cc src/test/compile-fail/no-send-res-ports.rs
index 6f5741788ee2d5a4a9d224d8df7fc58867a3c6f0,0b0a83a41966db61860d2cf1fddd9906a5141534..551953af13520e724db3bdc3dd4856f77b133217
--- 1/src/test/compile-fail/no-send-res-ports.rs
--- 2/src/test/compile-fail/no-send-res-ports.rs
+++ b/src/test/compile-fail/no-send-res-ports.rs
@@@ -36,9 -36,9 +36,9 @@@ fn main() 
      let x = foo(Port(Rc::new(())));
  
      Thread::spawn(move|| {
-         //~^ ERROR `core::kinds::Send` is not implemented
-         //~^^ ERROR `core::kinds::Send` is not implemented
+         //~^ ERROR `core::marker::Send` is not implemented
+         //~^^ ERROR `core::marker::Send` is not implemented
          let y = x;
 -        println!("{}", y);
 +        println!("{:?}", y);
      });
  }