Skip to content

Commit 8ae2312

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 bfbf42c + 04670a1 commit 8ae2312

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/expr.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,7 @@ pub(crate) fn format_expr(
334334
// satisfy our width restrictions.
335335
// Style Guide RFC for InlineAsm variant pending
336336
// https://github.com/rust-dev-tools/fmt-rfcs/issues/152
337-
ast::ExprKind::LlvmInlineAsm(..) | ast::ExprKind::InlineAsm(..) => {
338-
Some(context.snippet(expr.span).to_owned())
339-
}
337+
ast::ExprKind::InlineAsm(..) => Some(context.snippet(expr.span).to_owned()),
340338
ast::ExprKind::TryBlock(ref block) => {
341339
if let rw @ Some(_) =
342340
rewrite_single_line_block(context, "try ", block, Some(&expr.attrs), None, shape)

src/utils.rs

-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ pub(crate) fn is_block_expr(context: &RewriteContext<'_>, expr: &ast::Expr, repr
507507
| ast::ExprKind::Err
508508
| ast::ExprKind::Field(..)
509509
| ast::ExprKind::InlineAsm(..)
510-
| ast::ExprKind::LlvmInlineAsm(..)
511510
| ast::ExprKind::Let(..)
512511
| ast::ExprKind::Path(..)
513512
| ast::ExprKind::Range(..)

0 commit comments

Comments
 (0)