about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-22 21:38:03 +0000
committerbors <bors@rust-lang.org>2020-11-22 21:38:03 +0000
commita0d664bae6ca79c54cc054aa2403198e105190a2 (patch)
tree379e136a2c4022d1f794cb7008f0dba817b7d683 /library/std/src
parentc643dd2ec8fed2852f5eee8f776d657293a6a8f2 (diff)
parentdcef5ff372742eb3d8a1b5cbbc2141e757bc33d1 (diff)
downloadrust-a0d664bae6ca79c54cc054aa2403198e105190a2.tar.gz
rust-a0d664bae6ca79c54cc054aa2403198e105190a2.zip
Auto merge of #79219 - shepmaster:beta-bump, r=Mark-Simulacrum
Bump bootstrap compiler version

r? `@Mark-Simulacrum`

/cc `@pietroalbini`
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/ffi/c_str.rs2
-rw-r--r--library/std/src/lib.rs3
-rw-r--r--library/std/src/net/ip.rs3
3 files changed, 3 insertions, 5 deletions
diff --git a/library/std/src/ffi/c_str.rs b/library/std/src/ffi/c_str.rs
index 8c6d6c80402..60b642a6dba 100644
--- a/library/std/src/ffi/c_str.rs
+++ b/library/std/src/ffi/c_str.rs
@@ -1266,7 +1266,7 @@ impl CStr {
     /// behavior when `ptr` is used inside the `unsafe` block:
     ///
     /// ```no_run
-    /// # #![allow(unused_must_use)] #![cfg_attr(not(bootstrap), allow(temporary_cstring_as_ptr))]
+    /// # #![allow(unused_must_use)] #![allow(temporary_cstring_as_ptr)]
     /// use std::ffi::CString;
     ///
     /// let ptr = CString::new("Hello").expect("CString::new failed").as_ptr();
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index d2f36309e2d..6f534ca2a2e 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -206,7 +206,7 @@
 #![needs_panic_runtime]
 // std may use features in a platform-specific way
 #![allow(unused_features)]
-#![cfg_attr(not(bootstrap), feature(rustc_allow_const_fn_unstable))]
+#![feature(rustc_allow_const_fn_unstable)]
 #![cfg_attr(test, feature(internal_output_capture, print_internals, update_panic_count))]
 #![cfg_attr(
     all(target_vendor = "fortanix", target_env = "sgx"),
@@ -323,7 +323,6 @@
 #![feature(unsafe_block_in_unsafe_fn)]
 #![feature(unsafe_cell_get_mut)]
 #![feature(unsafe_cell_raw_get)]
-#![cfg_attr(bootstrap, feature(untagged_unions))]
 #![feature(unwind_attributes)]
 #![feature(vec_into_raw_parts)]
 #![feature(wake_trait)]
diff --git a/library/std/src/net/ip.rs b/library/std/src/net/ip.rs
index bb3ece4c273..04b6f0a5b91 100644
--- a/library/std/src/net/ip.rs
+++ b/library/std/src/net/ip.rs
@@ -1043,8 +1043,7 @@ impl Ipv6Addr {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[rustc_const_stable(feature = "const_ipv6", since = "1.32.0")]
-    #[cfg_attr(not(bootstrap), rustc_allow_const_fn_unstable(const_fn_transmute))]
-    #[cfg_attr(bootstrap, allow_internal_unstable(const_fn_transmute))]
+    #[rustc_allow_const_fn_unstable(const_fn_transmute)]
     pub const fn new(a: u16, b: u16, c: u16, d: u16, e: u16, f: u16, g: u16, h: u16) -> Ipv6Addr {
         let addr16 = [
             a.to_be(),