Bump version, upgrade bootstrap

This commit updates the version number to 1.17.0 as we're not on that version of
the nightly compiler, and at the same time this updates src/stage0.txt to
bootstrap from freshly minted beta compiler and beta Cargo.

5 files changed, 2 insertions, 18 deletions

diff --git a/src/librustc_const_math/Cargo.toml b/src/librustc_const_math/Cargo.toml
index e6db1557fbe..e74c1ef693c 100644
--- a/src/librustc_const_math/Cargo.toml
+++ b/src/librustc_const_math/Cargo.toml
@@ -11,4 +11,3 @@ crate-type = ["dylib"]
 [dependencies]
 serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
-rustc_i128 = { path = "../librustc_i128" }
diff --git a/src/librustc_const_math/int.rs b/src/librustc_const_math/int.rs
index 53f185b661b..3618bfa2081 100644
--- a/src/librustc_const_math/int.rs
+++ b/src/librustc_const_math/int.rs
@@ -11,7 +11,6 @@
 use std::cmp::Ordering;
 use syntax::attr::IntType;
 use syntax::ast::{IntTy, UintTy};
-use rustc_i128::{i128, u128};
 
 use super::is::*;
 use super::us::*;
@@ -54,7 +53,6 @@ macro_rules! bounds {
 
 mod ubounds {
     #![allow(dead_code)]
-    use rustc_i128::{u128, i128};
     bounds!{u128: 0,
         i8 I8MIN I8MAX i16 I16MIN I16MAX i32 I32MIN I32MAX i64 I64MIN I64MAX i128 I128MIN I128MAX
         u8 U8MIN U8MAX u16 U16MIN U16MAX u32 U32MIN U32MAX u64 U64MIN U64MAX u128 U128MIN U128MAX
@@ -65,12 +63,6 @@ mod ubounds {
 
 mod ibounds {
     #![allow(dead_code)]
-    use rustc_i128::i128;
-    #[cfg(stage0)]
-    pub const U64MIN: i128 = 0;
-    #[cfg(stage0)]
-    pub const U64MAX: i128 = i128::max_value();
-    #[cfg(not(stage0))]
     bounds!(i128, u64 U64MIN U64MAX);
 
     pub const U128MIN: i128 = 0;
@@ -483,10 +475,7 @@ derive_binop!(BitAnd, bitand);
 derive_binop!(BitOr, bitor);
 derive_binop!(BitXor, bitxor);
 
-#[cfg(not(stage0))]
 const I128_MIN: i128 = ::std::i128::MIN;
-#[cfg(stage0)]
-const I128_MIN: i128 = ::std::i64::MIN;
 
 fn check_division(
     lhs: ConstInt,
diff --git a/src/librustc_const_math/is.rs b/src/librustc_const_math/is.rs
index 19ae0c91fc5..8f28ba14c6a 100644
--- a/src/librustc_const_math/is.rs
+++ b/src/librustc_const_math/is.rs
@@ -10,7 +10,6 @@
 
 use syntax::ast;
 use super::err::*;
-use rustc_i128::i128;
 
 /// Depending on the target only one variant is ever used in a compilation.
 /// Anything else is an error. This invariant is checked at several locations
diff --git a/src/librustc_const_math/lib.rs b/src/librustc_const_math/lib.rs
index d40a6aa32fd..13764ce5bbb 100644
--- a/src/librustc_const_math/lib.rs
+++ b/src/librustc_const_math/lib.rs
@@ -26,13 +26,11 @@
 #![feature(rustc_private)]
 #![feature(staged_api)]
 #![feature(const_fn)]
-#![cfg_attr(not(stage0), feature(i128))]
+#![feature(i128)]
+#![feature(i128_type)]
 
 extern crate syntax;
 
-// SNAP: remove use of this crate
-extern crate rustc_i128;
-
 extern crate serialize as rustc_serialize; // used by deriving
 
 mod float;
diff --git a/src/librustc_const_math/us.rs b/src/librustc_const_math/us.rs
index 9ebf5cab6bb..76443f584ab 100644
--- a/src/librustc_const_math/us.rs
+++ b/src/librustc_const_math/us.rs
@@ -10,7 +10,6 @@
 
 use syntax::ast;
 use super::err::*;
-use rustc_i128::u128;
 
 /// Depending on the target only one variant is ever used in a compilation.
 /// Anything else is an error. This invariant is checked at several locations