rollup merge of #20708: aturon/new-int-modules

Conflicts:
	src/libserialize/lib.rs

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

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

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

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

diff --cc src/libcore/num/int.rs
index 93f5b31ca721cdbc8d55aba66626402eea31988b,fe68b78b2b6774dabeefe1c13ce59ab5dbef2f28..065763a0d8ed4394a95f938053e7724e8ded1eab
--- 1/src/libcore/num/int.rs
--- 2/src/libcore/num/int.rs
+++ b/src/libcore/num/int.rs
@@@ -8,13 -8,13 +8,16 @@@
  // option. This file may not be copied, modified, or distributed
  // except according to those terms.
  
- //! Operations and constants for architecture-sized signed integers (`int` type)
+ //! Deprecated: replaced by `isize`.
+ //!
+ //! The rollout of the new type will gradually take place over the
+ //! alpha cycle along with the development of clearer conventions
+ //! around integer types.
  
- #![stable]
- #![doc(primitive = "int")]
+ #![deprecated = "replaced by isize"]
  
 -#[cfg(target_word_size = "32")] int_module! { int, 32 }
 -#[cfg(target_word_size = "64")] int_module! { int, 64 }
 +#[cfg(stage0)] #[cfg(target_word_size = "32")] int_module! { int, 32 }
 +#[cfg(stage0)] #[cfg(target_word_size = "64")] int_module! { int, 64 }
 +
 +#[cfg(not(stage0))] #[cfg(target_pointer_width = "32")] int_module! { int, 32 }
 +#[cfg(not(stage0))] #[cfg(target_pointer_width = "64")] int_module! { int, 64 }

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

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

diff --cc src/librustc_back/svh.rs
Simple merge

diff --cc src/libserialize/json.rs
Simple merge

diff --cc src/libserialize/lib.rs
index d1e7f6967bf6d0fcb0c109881dccf8c38cbcc435,f0a51fcea1846c6fb203fe38eac9a5b0eaa55de5..d51f070632fd3bd33e7457e56654bf01395a3eb5
--- 1/src/libserialize/lib.rs
--- 2/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@@ -24,8 -23,8 +24,9 @@@ Core encoding and decoding interfaces
         html_root_url = "http://doc.rust-lang.org/nightly/",
         html_playground_url = "http://play.rust-lang.org/")]
  #![allow(unknown_features)]
--#![feature(slicing_syntax)]
 +#![cfg_attr(stage0, allow(unused_attributes))]
+ #![feature(old_impl_check)]
++#![feature(slicing_syntax)]
  
  // test harness access
  #[cfg(test)] extern crate test;

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

diff --cc src/libstd/lib.rs
index 15f279f1b450d2a01f21921b6e46097c299b4485,fa8cc6f4a184322f306e4f2ae14c71db49c87cca..c2daa08d4d31c140ec62fb7a69663e3023f2ac4c
--- 1/src/libstd/lib.rs
--- 2/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@@ -151,10 -149,8 +150,9 @@@ pub use core::clone
  #[cfg(not(test))] pub use core::cmp;
  pub use core::default;
  pub use core::finally;
 +pub use core::hash;
  pub use core::intrinsics;
  pub use core::iter;
- #[cfg(stage0)] #[cfg(not(test))] pub use core::marker as kinds;
  #[cfg(not(test))] pub use core::marker;
  pub use core::mem;
  #[cfg(not(test))] pub use core::ops;