about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-03 22:55:28 +0000
committerbors <bors@rust-lang.org>2017-02-03 22:55:28 +0000
commit0648517faf1e2cf37c8b6770cbd0180a816ed9a0 (patch)
tree72112e627a4cd04f53203220fbfc101c9e12b7b6 /src/libstd
parent86d9ed6c82c6745fec46b9ecf2fa91be7924dd16 (diff)
parent626e754473da96a670c917b9cbefd1c1ea888a9c (diff)
downloadrust-0648517faf1e2cf37c8b6770cbd0180a816ed9a0.tar.gz
rust-0648517faf1e2cf37c8b6770cbd0180a816ed9a0.zip
Auto merge of #39463 - alexcrichton:update-bootstrap, r=alexcrichton
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.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 37632ac76f2..181694dead0 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -399,7 +399,6 @@ pub use core::i32;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::i64;
 #[unstable(feature = "i128", issue = "35118")]
-#[cfg(not(stage0))]
 pub use core::i128;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::usize;
@@ -430,7 +429,6 @@ pub use core_collections::vec;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use std_unicode::char;
 #[unstable(feature = "i128", issue = "35118")]
-#[cfg(not(stage0))]
 pub use core::u128;
 
 pub mod f32;