diff options
| author | bors <bors@rust-lang.org> | 2020-04-20 02:18:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-20 02:18:00 +0000 |
| commit | 9b2f8dbba39dd4167f22a7026674a585c3d907d8 (patch) | |
| tree | 0b0b920e6b81d0b7477aeb4aa9e54e0e5fd2f560 /src/libstd | |
| parent | c6b55eed638db7db34e887ef255c765bc8910ec0 (diff) | |
| parent | ce83b49d161b9375849345be722e86c5417dfdda (diff) | |
Auto merge of #71007 - Amanieu:deprecate_asm, r=Mark-Simulacrum
Deprecate the asm! macro in favor of llvm_asm! Since we will be changing the syntax of `asm!` soon, deprecate it and encourage people to use `llvm_asm!` instead (which preserves the old syntax). This will avoid breakage when `asm!` is changed. RFC: https://github.com/rust-lang/rfcs/pull/2843
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/prelude/v1.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 59d845c619b..9d2810cacc2 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -524,6 +524,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, |
