Skip to content

Commit ff4ae3d

Browse files
committed
Auto merge of rust-lang#92816 - tmiasko:rm-llvm-asm, r=Amanieu
Remove deprecated LLVM-style inline assembly The `llvm_asm!` was deprecated back in rust-lang#87590 1.56.0, with intention to remove it once `asm!` was stabilized, which already happened in rust-lang#91728 1.59.0. Now it is time to remove `llvm_asm!` to avoid continued maintenance cost. Closes rust-lang#70173. Closes rust-lang#92794. Closes rust-lang#87612. Closes rust-lang#82065. cc `@rust-lang/wg-inline-asm` r? `@Amanieu`
2 parents 77b2e24 + d817a9f commit ff4ae3d

File tree

5 files changed

+6
-35
lines changed

5 files changed

+6
-35
lines changed

core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@
180180
#![feature(intrinsics)]
181181
#![feature(lang_items)]
182182
#![feature(link_llvm_intrinsics)]
183-
#![feature(llvm_asm)]
184183
#![feature(min_specialization)]
185184
#![feature(mixed_integer_ops)]
186185
#![feature(must_not_suspend)]

core/src/macros/mod.rs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,32 +1397,6 @@ pub(crate) mod builtin {
13971397
($cond:expr, $($arg:tt)+) => {{ /* compiler built-in */ }};
13981398
}
13991399

1400-
/// LLVM-style inline assembly.
1401-
///
1402-
/// Read the [unstable book] for the usage.
1403-
///
1404-
/// [unstable book]: ../unstable-book/library-features/llvm-asm.html
1405-
#[unstable(
1406-
feature = "llvm_asm",
1407-
issue = "70173",
1408-
reason = "prefer using the new asm! syntax instead"
1409-
)]
1410-
#[rustc_deprecated(
1411-
since = "1.56",
1412-
reason = "will be removed from the compiler, use asm! instead"
1413-
)]
1414-
#[rustc_builtin_macro]
1415-
#[macro_export]
1416-
macro_rules! llvm_asm {
1417-
("assembly template"
1418-
: $("output"(operand),)*
1419-
: $("input"(operand),)*
1420-
: $("clobbers",)*
1421-
: $("options",)*) => {
1422-
/* compiler built-in */
1423-
};
1424-
}
1425-
14261400
/// Prints passed tokens into the standard output.
14271401
#[unstable(
14281402
feature = "log_syntax",

core/src/prelude/v1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ pub use crate::hash::macros::Hash;
5656
#[doc(no_inline)]
5757
pub use crate::{
5858
assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args,
59-
format_args_nl, include, include_bytes, include_str, line, llvm_asm, log_syntax, module_path,
60-
option_env, stringify, trace_macros,
59+
format_args_nl, include, include_bytes, include_str, line, log_syntax, module_path, option_env,
60+
stringify, trace_macros,
6161
};
6262

6363
#[unstable(

std/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@
294294
#![feature(intra_doc_pointers)]
295295
#![feature(lang_items)]
296296
#![feature(linkage)]
297-
#![feature(llvm_asm)]
298297
#![feature(log_syntax)]
299298
#![feature(map_try_insert)]
300299
#![feature(maybe_uninit_slice)]
@@ -571,8 +570,8 @@ pub use core::{
571570
#[allow(deprecated)]
572571
pub use core::{
573572
assert, assert_matches, cfg, column, compile_error, concat, concat_idents, const_format_args,
574-
env, file, format_args, format_args_nl, include, include_bytes, include_str, line, llvm_asm,
575-
log_syntax, module_path, option_env, stringify, trace_macros,
573+
env, file, format_args, format_args_nl, include, include_bytes, include_str, line, log_syntax,
574+
module_path, option_env, stringify, trace_macros,
576575
};
577576

578577
#[unstable(

std/src/prelude/v1.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ pub use crate::result::Result::{self, Err, Ok};
4040
#[doc(no_inline)]
4141
pub use core::prelude::v1::{
4242
assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args,
43-
format_args_nl, include, include_bytes, include_str, line, llvm_asm, log_syntax, module_path,
44-
option_env, stringify, trace_macros, Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq,
45-
PartialOrd,
43+
format_args_nl, include, include_bytes, include_str, line, log_syntax, module_path, option_env,
44+
stringify, trace_macros, Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd,
4645
};
4746

4847
#[unstable(

0 commit comments

Comments
 (0)