Rollup of 8 pull requests

Cargo.lock

@@ -816,6 +816,7 @@ dependencies = [
  "lazycell",
  "libc",
  "miow",
+ "miropt-test-tools",
  "regex",
  "rustfix",
  "serde",
@@ -2268,6 +2269,13 @@ dependencies = [
  "ui_test",
 ]
 
+[[package]]
+name = "miropt-test-tools"
+version = "0.1.0"
+dependencies = [
+ "regex",
+]
+
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.4"
@@ -4920,6 +4928,7 @@ version = "0.1.0"
 dependencies = [
  "cargo_metadata 0.14.0",
  "lazy_static",
+ "miropt-test-tools",
  "regex",
  "walkdir",
 ]

Cargo.toml

@@ -11,6 +11,7 @@ members = [
  "src/tools/error_index_generator",
  "src/tools/linkchecker",
  "src/tools/lint-docs",
+ "src/tools/miropt-test-tools",
  "src/tools/rustbook",
  "src/tools/unstable-book-gen",
  "src/tools/tidy",

compiler/rustc_ast_lowering/src/errors.rs

@@ -277,8 +277,9 @@ pub struct RegisterConflict<'a> {
 pub struct SubTupleBinding<'a> {
  #[primary_span]
  #[label]
- #[suggestion_verbose(
+ #[suggestion(
  ast_lowering_sub_tuple_binding_suggestion,
+ style = "verbose",
  code = "..",
  applicability = "maybe-incorrect"
  )]

compiler/rustc_borrowck/src/session_diagnostics.rs

@@ -49,7 +49,7 @@ pub(crate) struct GenericDoesNotLiveLongEnough {
 #[derive(LintDiagnostic)]
 #[diag(borrowck_var_does_not_need_mut)]
 pub(crate) struct VarNeedNotMut {
- #[suggestion_short(applicability = "machine-applicable", code = "")]
+ #[suggestion(style = "short", applicability = "machine-applicable", code = "")]
  pub span: Span,
 }
 #[derive(Diagnostic)]

compiler/rustc_codegen_ssa/src/target_features.rs

@@ -267,6 +267,7 @@ const WASM_ALLOWED_FEATURES: &[(&str, Option<Symbol>)] = &[
  // tidy-alphabetical-start
  ("atomics", Some(sym::wasm_target_feature)),
  ("bulk-memory", Some(sym::wasm_target_feature)),
+ ("multivalue", Some(sym::wasm_target_feature)),
  ("mutable-globals", Some(sym::wasm_target_feature)),
  ("nontrapping-fptoint", Some(sym::wasm_target_feature)),
  ("reference-types", Some(sym::wasm_target_feature)),

compiler/rustc_hir_analysis/src/errors.rs

@@ -120,7 +120,7 @@ pub struct TypeofReservedKeywordUsed<'tcx> {
  #[primary_span]
  #[label]
  pub span: Span,
- #[suggestion_verbose(code = "{ty}")]
+ #[suggestion(style = "verbose", code = "{ty}")]
  pub opt_sugg: Option<(Span, Applicability)>,
 }
 
@@ -239,7 +239,11 @@ pub struct UnusedExternCrate {
 #[derive(LintDiagnostic)]
 #[diag(hir_analysis_extern_crate_not_idiomatic)]
 pub struct ExternCrateNotIdiomatic {
- #[suggestion_short(applicability = "machine-applicable", code = "{suggestion_code}")]
+ #[suggestion(
+ style = "short",
+ applicability = "machine-applicable",
+ code = "{suggestion_code}"
+ )]
  pub span: Span,
  pub msg_code: String,
  pub suggestion_code: String,

compiler/rustc_hir_typeck/src/errors.rs

@@ -113,8 +113,9 @@ pub struct MissingParentheseInRange {
 }
 
 #[derive(Subdiagnostic)]
-#[multipart_suggestion_verbose(
+#[multipart_suggestion(
  hir_analysis_add_missing_parentheses_in_range,
+ style = "verbose",
  applicability = "maybe-incorrect"
 )]
 pub struct AddMissingParenthesesInRange {

compiler/rustc_infer/src/errors/mod.rs

@@ -109,8 +109,9 @@ pub struct InferenceBadError<'a> {
 
 #[derive(Subdiagnostic)]
 pub enum SourceKindSubdiag<'a> {
- #[suggestion_verbose(
+ #[suggestion(
  infer_source_kind_subdiag_let,
+ style = "verbose",
  code = ": {type_name}",
  applicability = "has-placeholders"
  )]
@@ -135,8 +136,9 @@ pub enum SourceKindSubdiag<'a> {
  parent_prefix: String,
  parent_name: String,
  },
- #[suggestion_verbose(
+ #[suggestion(
  infer_source_kind_subdiag_generic_suggestion,
+ style = "verbose",
  code = "::<{args}>",
  applicability = "has-placeholders"
  )]
@@ -150,8 +152,9 @@ pub enum SourceKindSubdiag<'a> {
 
 #[derive(Subdiagnostic)]
 pub enum SourceKindMultiSuggestion<'a> {
- #[multipart_suggestion_verbose(
+ #[multipart_suggestion(
  infer_source_kind_fully_qualified,
+ style = "verbose",
  applicability = "has-placeholders"
  )]
  FullyQualified {
@@ -163,8 +166,9 @@ pub enum SourceKindMultiSuggestion<'a> {
  adjustment: &'a str,
  successor_pos: &'a str,
  },
- #[multipart_suggestion_verbose(
+ #[multipart_suggestion(
  infer_source_kind_closure_return,
+ style = "verbose",
  applicability = "has-placeholders"
  )]
  ClosureReturn {
@@ -478,8 +482,9 @@ pub enum ImplicitStaticLifetimeSubdiag {
  #[primary_span]
  span: Span,
  },
- #[suggestion_verbose(
+ #[suggestion(
  infer_implicit_static_lifetime_suggestion,
+ style = "verbose",
  code = " + '_",
  applicability = "maybe-incorrect"
  )]

compiler/rustc_lint/src/errors.rs

@@ -83,7 +83,7 @@ pub struct UnknownToolInScopedLint {
 pub struct BuiltinEllpisisInclusiveRangePatterns {
  #[primary_span]
  pub span: Span,
- #[suggestion_short(code = "{replace}", applicability = "machine-applicable")]
+ #[suggestion(style = "short", code = "{replace}", applicability = "machine-applicable")]
  pub suggestion: Span,
  pub replace: String,
 }

compiler/rustc_lint/src/opaque_hidden_inferred_bound.rs

@@ -150,8 +150,9 @@ struct OpaqueHiddenInferredBoundLint<'tcx> {
 }
 
 #[derive(Subdiagnostic)]
-#[suggestion_verbose(
+#[suggestion(
  lint_opaque_hidden_inferred_bound_sugg,
+ style = "verbose",
  applicability = "machine-applicable",
  code = " + {trait_ref}"
 )]

compiler/rustc_macros/src/diagnostics/mod.rs

@@ -129,7 +129,7 @@ pub fn lint_diagnostic_derive(s: Structure<'_>) -> TokenStream {
 /// }
 ///
 /// #[derive(Subdiagnostic)]
-/// #[suggestion_verbose(parser::raw_identifier)]
+/// #[suggestion(style = "verbose",parser::raw_identifier)]
 /// pub struct RawIdentifierSuggestion<'tcx> {
 /// #[primary_span]
 /// span: Span,