about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAmanieu d'Antras <amanieu@gmail.com>2020-04-10 17:34:30 +0100
committerAmanieu d'Antras <amanieu@gmail.com>2020-04-15 18:09:00 +0100
commitce83b49d161b9375849345be722e86c5417dfdda (patch)
tree55494c0f58edd347fbe890aecf5553d1040202e8 /src/libstd
parentc4ca63885e4057e3e51d07f49ef139f56da6b63b (diff)
downloadrust-ce83b49d161b9375849345be722e86c5417dfdda.tar.gz
rust-ce83b49d161b9375849345be722e86c5417dfdda.zip
Deprecate the asm! macro
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs1
-rw-r--r--src/libstd/prelude/v1.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index a9a519f0a3a..dfb5177bf67 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -523,6 +523,7 @@ pub use core::{
 
 // Re-export built-in macros defined through libcore.
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+#[allow(deprecated)]
 pub use core::{
     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,
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs
index 03686d789d7..92e3ea84850 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -36,6 +36,7 @@ pub use crate::result::Result::{self, Err, Ok};
 
 // Re-exported built-in macros
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
+#[allow(deprecated)]
 #[doc(no_inline)]
 pub use core::prelude::v1::{
     asm, assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args,