carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 21:31:24 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix some minor errors in diagnostic text. (#3047)

Browse Source
This commit is contained in:
Richard Smith
2023-08-02 18:17:16 +00:00
committed by GitHub
parent 0c33dead70
commit 90d2d7ef65
8 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/semantics_context.cpp
+3 -2
View File
@@ -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,
toolchain/semantics/testdata/basics/fail_name_lookup.carbon
Vendored
+1 -1
View File
@@ -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;
toolchain/semantics/testdata/function/call/fail_param_type.carbon
Vendored
+1 -1
View File
@@ -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);
toolchain/semantics/testdata/if/fail_scope.carbon
Vendored
+1 -1
View File
@@ -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;
toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon
Vendored
+1 -1
View File
@@ -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() {
toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon
Vendored
+1 -1
View File
@@ -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; }
toolchain/semantics/testdata/var/fail_init_with_self.carbon
Vendored
+1 -1
View File
@@ -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;
toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon
Vendored
+1 -1
View File
@@ -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;