about summary refs log tree commit diff
path: root/library/std/src/prelude
diff options
context:
space:
mode:
authorbstrie <865233+bstrie@users.noreply.github.com>2021-07-17 14:48:00 -0400
committerbstrie <865233+bstrie@users.noreply.github.com>2021-07-18 18:30:58 -0400
commitf26fbe2453806adc241ae07942621fa638369c30 (patch)
tree9753ab7422f232ce6d2a03c985acdc1a1bbc6b4b /library/std/src/prelude
parentc78ebb7bdcfc924a20fd069891ffe1364d6814e7 (diff)
downloadrust-f26fbe2453806adc241ae07942621fa638369c30.tar.gz
rust-f26fbe2453806adc241ae07942621fa638369c30.zip
Move asm! and global_asm! to core::arch
Diffstat (limited to 'library/std/src/prelude')
-rw-r--r--library/std/src/prelude/v1.rs24
1 files changed, 20 insertions, 4 deletions
diff --git a/library/std/src/prelude/v1.rs b/library/std/src/prelude/v1.rs
index 4a3c3ba1635..772044f0149 100644
--- a/library/std/src/prelude/v1.rs
+++ b/library/std/src/prelude/v1.rs
@@ -39,12 +39,28 @@ pub use crate::result::Result::{self, Err, Ok};
 #[allow(deprecated)]
 #[doc(no_inline)]
 pub use core::prelude::v1::{
-    asm, assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args,
-    format_args_nl, global_asm, include, include_bytes, include_str, line, llvm_asm, log_syntax,
-    module_path, option_env, stringify, trace_macros, Clone, Copy, Debug, Default, Eq, Hash, Ord,
-    PartialEq, PartialOrd,
+    assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args,
+    format_args_nl, include, include_bytes, include_str, line, llvm_asm, log_syntax, module_path,
+    option_env, stringify, trace_macros, Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq,
+    PartialOrd,
 };
 
+#[unstable(
+    feature = "asm",
+    issue = "72016",
+    reason = "inline assembly is not stable enough for use and is subject to change"
+)]
+#[doc(no_inline)]
+pub use core::prelude::v1::asm;
+
+#[unstable(
+    feature = "global_asm",
+    issue = "35119",
+    reason = "`global_asm!` is not stable enough for use and is subject to change"
+)]
+#[doc(no_inline)]
+pub use core::prelude::v1::global_asm;
+
 // FIXME: Attribute and internal derive macros are not documented because for them rustdoc generates
 // dead links which fail link checker testing.
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]