about summary refs log tree commit diff
path: root/src/librustc_errors
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-07 11:58:38 +0000
committerbors <bors@rust-lang.org>2018-04-07 11:58:38 +0000
commit8c2d7b2da322af89f310183cdca662a99ade6d22 (patch)
treeb34cdb0605715be99a795e67a4b3103744e800a3 /src/librustc_errors
parent04fef17143daad88bdc4314561e9c2eb5a364805 (diff)
parent8958815916201421b0a6648c68d7eb31bd3197ee (diff)
downloadrust-8c2d7b2da322af89f310183cdca662a99ade6d22.tar.gz
rust-8c2d7b2da322af89f310183cdca662a99ade6d22.zip
Auto merge of #49661 - alexcrichton:bump-bootstrap, r=nikomatsakis
Bump the bootstrap compiler to 1.26.0 beta

Holy cow that's a lot of `cfg(stage0)` removed and a lot of new stable language
features!
Diffstat (limited to 'src/librustc_errors')
-rw-r--r--src/librustc_errors/lib.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 43fe812a6ce..a723e455222 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -17,8 +17,6 @@
 #![allow(unused_attributes)]
 #![feature(range_contains)]
 #![cfg_attr(unix, feature(libc))]
-#![cfg_attr(stage0, feature(conservative_impl_trait))]
-#![cfg_attr(stage0, feature(i128_type))]
 #![feature(optin_builtin_traits)]
 
 extern crate atty;