From 90d2d7ef65aa014cf8f956bf3d683ab8ae385171 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 2 Aug 2023 11:17:16 -0700 Subject: [PATCH] Fix some minor errors in diagnostic text. (#3047) --- toolchain/semantics/semantics_context.cpp | 5 +++-- toolchain/semantics/testdata/basics/fail_name_lookup.carbon | 2 +- .../semantics/testdata/function/call/fail_param_type.carbon | 2 +- toolchain/semantics/testdata/if/fail_scope.carbon | 2 +- .../testdata/namespace/fail_unresolved_scope.carbon | 2 +- .../testdata/struct/fail_access_into_invalid.carbon | 2 +- toolchain/semantics/testdata/var/fail_init_with_self.carbon | 2 +- .../semantics/testdata/var/fail_lookup_outside_scope.carbon | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/toolchain/semantics/semantics_context.cpp b/toolchain/semantics/semantics_context.cpp index 332a70f06d09..17627166ab0a 100644 --- a/toolchain/semantics/semantics_context.cpp +++ b/toolchain/semantics/semantics_context.cpp @@ -91,7 +91,8 @@ auto SemanticsContext::DiagnoseDuplicateName(ParseTree::Node parse_node, auto SemanticsContext::DiagnoseNameNotFound(ParseTree::Node parse_node, SemanticsStringId name_id) -> void { - CARBON_DIAGNOSTIC(NameNotFound, Error, "Name {0} not found", llvm::StringRef); + CARBON_DIAGNOSTIC(NameNotFound, Error, "Name `{0}` not found", + llvm::StringRef); emitter_->Emit(parse_node, NameNotFound, semantics_ir_->GetString(name_id)); } @@ -304,7 +305,7 @@ auto SemanticsContext::ImplicitAsForArgs( ImplicitAsKind::Incompatible) { CARBON_CHECK(diagnostic != nullptr) << "Should have validated first"; CARBON_DIAGNOSTIC(CallArgTypeMismatch, Note, - "Function cannot be used: Cannot implicityly convert " + "Function cannot be used: Cannot implicitly convert " "argument {0} from `{1}` to `{2}`.", size_t, std::string, std::string); diagnostic->Note(param_parse_node, CallArgTypeMismatch, i, diff --git a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon index a7388d8d82bd..fa791e4afa0a 100644 --- a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon @@ -35,7 +35,7 @@ // CHECK:STDOUT: ] fn Main() { - // CHECK:STDERR: fail_name_lookup.carbon:[[@LINE+3]]:3: Name x not found + // CHECK:STDERR: fail_name_lookup.carbon:[[@LINE+3]]:3: Name `x` not found // CHECK:STDERR: x; // CHECK:STDERR: ^ x; diff --git a/toolchain/semantics/testdata/function/call/fail_param_type.carbon b/toolchain/semantics/testdata/function/call/fail_param_type.carbon index 3152ae7aa732..e37c3e6d9552 100644 --- a/toolchain/semantics/testdata/function/call/fail_param_type.carbon +++ b/toolchain/semantics/testdata/function/call/fail_param_type.carbon @@ -67,7 +67,7 @@ fn Main() { // CHECK:STDERR: fail_param_type.carbon:[[@LINE+6]]:6: No matching callable was found. // CHECK:STDERR: Run(1.0); // CHECK:STDERR: ^ - // CHECK:STDERR: fail_param_type.carbon:[[@LINE-6]]:1: Function cannot be used: Cannot implicityly convert argument 0 from `f64` to `i32`. + // CHECK:STDERR: fail_param_type.carbon:[[@LINE-6]]:1: Function cannot be used: Cannot implicitly convert argument 0 from `f64` to `i32`. // CHECK:STDERR: fn Run(a: i32) {} // CHECK:STDERR: ^ Run(1.0); diff --git a/toolchain/semantics/testdata/if/fail_scope.carbon b/toolchain/semantics/testdata/if/fail_scope.carbon index 3e5a2aba8076..3056e4f38ce6 100644 --- a/toolchain/semantics/testdata/if/fail_scope.carbon +++ b/toolchain/semantics/testdata/if/fail_scope.carbon @@ -71,7 +71,7 @@ fn VarScope(b: bool) -> i32 { var n: i32 = 2; return n; } - // CHECK:STDERR: fail_scope.carbon:[[@LINE+3]]:10: Name n not found + // CHECK:STDERR: fail_scope.carbon:[[@LINE+3]]:10: Name `n` not found // CHECK:STDERR: return n; // CHECK:STDERR: ^ return n; diff --git a/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon index 01925bedd97b..7c20bb09db94 100644 --- a/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon @@ -34,7 +34,7 @@ // CHECK:STDOUT: ], // CHECK:STDOUT: ] -// CHECK:STDERR: fail_unresolved_scope.carbon:[[@LINE+3]]:4: Name Foo not found +// CHECK:STDERR: fail_unresolved_scope.carbon:[[@LINE+3]]:4: Name `Foo` not found // CHECK:STDERR: fn Foo.Baz() { // CHECK:STDERR: ^ fn Foo.Baz() { diff --git a/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon b/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon index abb49ba2d32a..ee5e4d7a43dd 100644 --- a/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon @@ -36,7 +36,7 @@ // CHECK:STDOUT: ] -// CHECK:STDERR: fail_access_into_invalid.carbon:[[@LINE+3]]:10: Name a not found +// CHECK:STDERR: fail_access_into_invalid.carbon:[[@LINE+3]]:10: Name `a` not found // CHECK:STDERR: fn F() { a.b; } // CHECK:STDERR: ^ fn F() { a.b; } diff --git a/toolchain/semantics/testdata/var/fail_init_with_self.carbon b/toolchain/semantics/testdata/var/fail_init_with_self.carbon index d81a72ebc872..81ebccb736a4 100644 --- a/toolchain/semantics/testdata/var/fail_init_with_self.carbon +++ b/toolchain/semantics/testdata/var/fail_init_with_self.carbon @@ -42,7 +42,7 @@ // CHECK:STDOUT: ] fn Main() { - // CHECK:STDERR: fail_init_with_self.carbon:[[@LINE+3]]:16: Name x not found + // CHECK:STDERR: fail_init_with_self.carbon:[[@LINE+3]]:16: Name `x` not found // CHECK:STDERR: var x: i32 = x; // CHECK:STDERR: ^ var x: i32 = x; diff --git a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon index febe670484e2..8cb344ecb79b 100644 --- a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon @@ -50,7 +50,7 @@ fn Main() { var x: i32; } -// CHECK:STDERR: fail_lookup_outside_scope.carbon:[[@LINE+3]]:14: Name x not found +// CHECK:STDERR: fail_lookup_outside_scope.carbon:[[@LINE+3]]:14: Name `x` not found // CHECK:STDERR: var y: i32 = x; // CHECK:STDERR: ^ var y: i32 = x;