Auto merge of #155011 - JonathanBrouwer:rollup-9GJWM3g, r=JonathanBrouwer

Rollup of 6 pull requests

Successful merges:

 - #154912 (Remove `BuiltinLintDiag`)
 - #154598 (test `#[naked]` with `#[link_section = "..."]` on windows)
 - #154719 (Hexagon inline asm: add reg_pair, vreg, vreg_pair, and qreg register classes)
 - #154057 (Parenthesize block-like expressions in index base of pretty printer)
 - #154893 (make `expected_literal` positive)
 - #155002 (Clarify that `core::range` ranges do not have special syntax)

Author: bors

compiler/rustc_ast_pretty/src/pprust/state/expr.rs

@@ -235,7 +235,15 @@ impl<'a> State<'a> {
             // In order to call a named field, needs parens: `(self.fun)()`
             // But not for an unnamed field: `self.0()`
             ast::ExprKind::Field(_, name) => !name.is_numeric(),
-            _ => func_fixup.precedence(func) < ExprPrecedence::Unambiguous,
+            // Block-like expressions (block, match, if, loop, ...) never
+            // parse as the callee of a call, regardless of context: the
+            // closing brace ends the expression and `(args)` becomes a
+            // separate tuple. Parenthesize them so the call survives a
+            // pretty-print round trip.
+            _ => {
+                func_fixup.precedence(func) < ExprPrecedence::Unambiguous
+                    || classify::expr_is_complete(func)
+            }
         };
 
         self.print_expr_cond_paren(func, needs_paren, func_fixup);
@@ -677,7 +685,8 @@ impl<'a> State<'a> {
                 let expr_fixup = fixup.leftmost_subexpression_with_operator(true);
                 self.print_expr_cond_paren(
                     expr,
-                    expr_fixup.precedence(expr) < ExprPrecedence::Unambiguous,
+                    expr_fixup.precedence(expr) < ExprPrecedence::Unambiguous
+                        || classify::expr_is_complete(expr),
                     expr_fixup,
                 );
                 self.word("[");

compiler/rustc_attr_parsing/src/attributes/deprecation.rs

@@ -83,7 +83,7 @@ impl<S: Stage> SingleAttributeParser<S> for DeprecatedParser {
             ArgParser::List(list) => {
                 for param in list.mixed() {
                     let Some(param) = param.meta_item() else {
-                        cx.adcx().unexpected_literal(param.span());
+                        cx.adcx().expected_not_literal(param.span());
                         return None;
                     };
 

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -93,7 +93,7 @@ impl<S: Stage> CombineAttributeParser<S> for LinkParser {
         let mut import_name_type = None;
         for item in items.mixed() {
             let Some(item) = item.meta_item() else {
-                cx.adcx().unexpected_literal(item.span());
+                cx.adcx().expected_not_literal(item.span());
                 continue;
             };
 

compiler/rustc_attr_parsing/src/attributes/macro_attrs.rs

@@ -185,7 +185,7 @@ impl<S: Stage> SingleAttributeParser<S> for CollapseDebugInfoParser {
             return None;
         };
         let Some(mi) = single.meta_item() else {
-            cx.adcx().unexpected_literal(single.span());
+            cx.adcx().expected_not_literal(single.span());
             return None;
         };
         if let Err(err) = mi.args().no_args() {

compiler/rustc_attr_parsing/src/attributes/proc_macro_attrs.rs

@@ -78,7 +78,7 @@ fn parse_derive_like<S: Stage>(
         return None;
     };
     let Some(trait_attr) = trait_attr.meta_item() else {
-        cx.adcx().unexpected_literal(trait_attr.span());
+        cx.adcx().expected_not_literal(trait_attr.span());
         return None;
     };
     let Some(trait_ident) = trait_attr.path().word() else {
@@ -98,7 +98,7 @@ fn parse_derive_like<S: Stage>(
     let mut attributes = ThinVec::new();
     if let Some(attrs) = items.next() {
         let Some(attr_list) = attrs.meta_item() else {
-            cx.adcx().unexpected_literal(attrs.span());
+            cx.adcx().expected_not_literal(attrs.span());
             return None;
         };
         if !attr_list.path().word_is(sym::attributes) {

compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs

@@ -744,7 +744,7 @@ impl<S: Stage> CombineAttributeParser<S> for RustcLayoutParser {
         let mut result = Vec::new();
         for item in items.mixed() {
             let Some(arg) = item.meta_item() else {
-                cx.adcx().unexpected_literal(item.span());
+                cx.adcx().expected_not_literal(item.span());
                 continue;
             };
             let Some(ident) = arg.ident() else {

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -319,7 +319,7 @@ pub(crate) fn parse_stability<S: Stage>(
     for param in list.mixed() {
         let param_span = param.span();
         let Some(param) = param.meta_item() else {
-            cx.adcx().unexpected_literal(param.span());
+            cx.adcx().expected_not_literal(param.span());
             return None;
         };
 
@@ -390,7 +390,7 @@ pub(crate) fn parse_unstability<S: Stage>(
 
     for param in list.mixed() {
         let Some(param) = param.meta_item() else {
-            cx.adcx().unexpected_literal(param.span());
+            cx.adcx().expected_not_literal(param.span());
             return None;
         };
 

compiler/rustc_attr_parsing/src/attributes/test_attrs.rs

@@ -220,7 +220,7 @@ impl<S: Stage> SingleAttributeParser<S> for TestRunnerParser {
         };
 
         let Some(meta) = single.meta_item() else {
-            cx.adcx().unexpected_literal(single.span());
+            cx.adcx().expected_not_literal(single.span());
             return None;
         };
 

compiler/rustc_attr_parsing/src/attributes/traits.rs

@@ -29,7 +29,7 @@ impl<S: Stage> SingleAttributeParser<S> for RustcSkipDuringMethodDispatchParser
         }
         for arg in args.mixed() {
             let Some(arg) = arg.meta_item() else {
-                cx.adcx().unexpected_literal(arg.span());
+                cx.adcx().expected_not_literal(arg.span());
                 continue;
             };
             if let Err(span) = arg.args().no_args() {

compiler/rustc_attr_parsing/src/context.rs

@@ -747,8 +747,8 @@ where
 
     /// An error that should be emitted when a [`MetaItemOrLitParser`](crate::parser::MetaItemOrLitParser)
     /// was expected *not* to be a literal, but instead a meta item.
-    pub(crate) fn unexpected_literal(&mut self, span: Span) -> ErrorGuaranteed {
-        self.emit_parse_error(span, AttributeParseErrorReason::UnexpectedLiteral)
+    pub(crate) fn expected_not_literal(&mut self, span: Span) -> ErrorGuaranteed {
+        self.emit_parse_error(span, AttributeParseErrorReason::ExpectedNotLiteral)
     }
 
     pub(crate) fn expected_single_argument(&mut self, span: Span) -> ErrorGuaranteed {