A little more match

carbon-language · Mar 5, 2024 · 848f3db · 848f3db
1 parent 4a0d225
commit 848f3db
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/toolchain/check/function.cpp b/toolchain/check/function.cpp
@@ -83,7 +83,7 @@ static auto DoParamAgrees(Context& context, SemIR::InstId new_decl_id,
  "Function declaration with {0}{1} parameter(s) disagrees.", int32_t,
  llvm::StringLiteral);
  CARBON_DIAGNOSTIC(FunctionSignatureParamCountPrevious, Note,
- "Matched function declaration has {0}{1} parameter(s).",
+ "Matched function declaration with {0}{1} parameter(s).",
  int32_t, llvm::StringLiteral);
  context.emitter()
  .Build(new_decl_id, FunctionSignatureParamCountDisagree,
@@ -96,13 +96,13 @@ static auto DoParamAgrees(Context& context, SemIR::InstId new_decl_id,
  for (auto [index, new_param_ref_id, prev_param_ref_id] :
  llvm::enumerate(new_param_ref_ids, prev_param_ref_ids)) {
  if (!DoesParamAgree(context, new_param_ref_id, prev_param_ref_id)) {
+ CARBON_DIAGNOSTIC(FunctionSignatureParamDisagree, Error,
+ "Function declaration with{1} parameter {0} disagrees.",
+ int32_t, llvm::StringLiteral);
  CARBON_DIAGNOSTIC(
- FunctionSignatureParamDisagree, Error,
- "Function declaration with {1} parameter {0} disagrees.", int32_t,
- llvm::StringLiteral);
- CARBON_DIAGNOSTIC(FunctionSignatureParamPrevious, Note,
- "Matched declaration has {1} parameter {0}.", int32_t,
- llvm::StringLiteral);
+ FunctionSignatureParamPrevious, Note,
+ "Checked agreement with matched function declaration{1} parameter here.",
+ int32_t, llvm::StringLiteral);
  context.emitter()
  .Build(new_param_ref_id, FunctionSignatureParamDisagree,
  new_param_ref_ids.size(), param_diag_label)

diff --git a/toolchain/check/testdata/function/declaration/fail_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_redecl.carbon
@@ -26,7 +26,7 @@ fn C();
 // CHECK:STDERR: fail_redecl.carbon:[[@LINE+6]]:1: ERROR: Function declaration with 1 parameter(s) disagrees.
 // CHECK:STDERR: fn C(x: i32);
 // CHECK:STDERR: ^~~~~~~~~~~~~
-// CHECK:STDERR: fail_redecl.carbon:[[@LINE-4]]:1: Matched function declaration has 0 parameter(s).
+// CHECK:STDERR: fail_redecl.carbon:[[@LINE-4]]:1: Matched function declaration with 0 parameter(s).
 // CHECK:STDERR: fn C();
 // CHECK:STDERR: ^~~~~~~
 fn C(x: i32);

diff --git a/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon b/toolchain/check/testdata/function/definition/fail_decl_param_mismatch.carbon
@@ -8,7 +8,7 @@ fn F();
 // CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE+6]]:1: ERROR: Function declaration with 1 parameter(s) disagrees.
 // CHECK:STDERR: fn F(x: i32) {}
 // CHECK:STDERR: ^~~~~~~~~~~~~~
-// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE-4]]:1: Matched function declaration has 0 parameter(s).
+// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE-4]]:1: Matched function declaration with 0 parameter(s).
 // CHECK:STDERR: fn F();
 // CHECK:STDERR: ^~~~~~~
 fn F(x: i32) {}
@@ -17,16 +17,16 @@ fn G(x: i32);
 // CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE+6]]:1: ERROR: Function declaration with 0 parameter(s) disagrees.
 // CHECK:STDERR: fn G() {}
 // CHECK:STDERR: ^~~~~~~~
-// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE-4]]:1: Matched function declaration has 1 parameter(s).
+// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE-4]]:1: Matched function declaration with 1 parameter(s).
 // CHECK:STDERR: fn G(x: i32);
 // CHECK:STDERR: ^~~~~~~~~~~~~
 fn G() {}
 
 fn H(x: i32);
-// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE+6]]:6: ERROR: Function declaration with  parameter 1 disagrees.
+// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE+6]]:6: ERROR: Function declaration with parameter 1 disagrees.
 // CHECK:STDERR: fn H(x: bool) {}
 // CHECK:STDERR: ^
-// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE-4]]:6: Matched declaration has parameter 1.
+// CHECK:STDERR: fail_decl_param_mismatch.carbon:[[@LINE-4]]:6: Checked agreement with matched function declaration parameter here.
 // CHECK:STDERR: fn H(x: i32);
 // CHECK:STDERR: ^
 fn H(x: bool) {}