Merge remote-tracking branch 'origin/master' into miri

diff --cc src/Cargo.lock
index bfb442ce3db95958c959f02739b42ae3956a79ea,0df5afe0b165c91e5e1ea179c7322869f86d3017..10c94184f93729e6875afe2bc67450da2798ffe5
--- 1/src/Cargo.lock
--- 2/src/Cargo.lock
+++ b/src/Cargo.lock
@@@ -164,14 -164,9 +164,14 @@@ dependencies = 
   "filetime 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 +[[package]]
 +name = "byteorder"
 +version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
  [[package]]
  name = "cargo"
- version = "0.24.0"
+ version = "0.25.0"
  dependencies = [
   "atty 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1618,12 -1603,8 +1618,12 @@@ dependencies = 
   "fmt_macros 0.0.0",
   "graphviz 0.0.0",
   "jobserver 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "log_settings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rustc_apfloat 0.0.0",
   "rustc_back 0.0.0",
   "rustc_const_math 0.0.0",
   "rustc_data_structures 0.0.0",

diff --cc src/librustc/mir/mod.rs
Simple merge

diff --cc src/tools/toolstate.toml
Simple merge