rollup merge of #17621 : sfackler/new-snap

diff --cc src/libcore/failure.rs
index a053c5a839d933e25367ab561daa6fd31404e596,ada83dae9aabd9543f17455750f8078845493105..9b63d325bc89add7fbe035be479676af95d5a707
--- 1/src/libcore/failure.rs
--- 2/src/libcore/failure.rs
+++ b/src/libcore/failure.rs
@@@ -33,28 -33,9 +33,9 @@@
  use fmt;
  use intrinsics;
  
- // NOTE: remove after next snapshot
- #[cfg(stage0)]
- pub use self::fail_ as fail;
- 
- // NOTE: remove after next snapshot
- #[cfg(stage0)]
- #[cold] #[inline(never)] // this is the slow path, always
- #[lang="fail_"]
- fn fail_(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
-     let (expr, file, line) = *expr_file_line;
-     let ref file_line = (file, line);
-     format_args!(|args| -> () {
-         fail_fmt(args, file_line);
-     }, "{}", expr);
- 
-     unsafe { intrinsics::abort() }
- }
- 
- #[cfg(not(stage0))]
  #[cold] #[inline(never)] // this is the slow path, always
  #[lang="fail"]
 -fn fail(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
 +pub fn fail(expr_file_line: &(&'static str, &'static str, uint)) -> ! {
      let (expr, file, line) = *expr_file_line;
      let ref file_line = (file, line);
      format_args!(|args| -> () {

diff --cc src/librustrt/unwind.rs
Simple merge