about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorJane Lusby <jlusby@yaah.dev>2022-04-11 18:12:26 -0700
committerJane Losare-Lusby <jlusby@yaah.dev>2022-07-08 21:18:13 +0000
commite7fe5456c53a8cc620a10f6284c366d6de0b7df0 (patch)
treea6602956abf2346184eacb332fe48cefa03afcb8 /library/std/src
parent052495d0017e2b18b781bcf0469a048e5051f5c0 (diff)
downloadrust-e7fe5456c53a8cc620a10f6284c366d6de0b7df0.tar.gz
rust-e7fe5456c53a8cc620a10f6284c366d6de0b7df0.zip
Support unstable moves via stable in unstable items
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/lib.rs3
-rw-r--r--library/std/src/panic.rs2
2 files changed, 3 insertions, 2 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 298321f41e4..8bd597d49aa 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -214,7 +214,7 @@
 #![cfg_attr(not(bootstrap), deny(ffi_unwind_calls))]
 // std may use features in a platform-specific way
 #![allow(unused_features)]
-#![cfg_attr(test, feature(internal_output_capture, print_internals, update_panic_count))]
+#![cfg_attr(test, feature(internal_output_capture, print_internals, update_panic_count, rt))]
 #![cfg_attr(
     all(target_vendor = "fortanix", target_env = "sgx"),
     feature(slice_index_methods, coerce_unsized, sgx_platform)
@@ -297,6 +297,7 @@
 // Library features (alloc):
 #![feature(alloc_layout_extra)]
 #![feature(alloc_c_string)]
+#![feature(alloc_ffi)]
 #![feature(allocator_api)]
 #![feature(get_mut_unchecked)]
 #![feature(map_try_insert)]
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
index ac16f476143..45bc56efb3b 100644
--- a/library/std/src/panic.rs
+++ b/library/std/src/panic.rs
@@ -11,7 +11,7 @@ use crate::thread::Result;
 
 #[doc(hidden)]
 #[unstable(feature = "edition_panic", issue = "none", reason = "use panic!() instead")]
-#[allow_internal_unstable(libstd_sys_internals, const_format_args, core_panic)]
+#[allow_internal_unstable(libstd_sys_internals, const_format_args, core_panic, rt)]
 #[cfg_attr(not(test), rustc_diagnostic_item = "std_panic_2015_macro")]
 #[rustc_macro_transparency = "semitransparent"]
 pub macro panic_2015 {