Skip to content

Commit 62c36ec

Browse files
jonmeowjonmeow
authored
Support printing the diagnostic kind for verification. (#4425)
This is to help identify which diagnostics we're actually using. Note that driver/testdata still has tests which don't pass this flag, and so continue to test the kind-less (default) behavior.
1 parent e395029 commit 62c36ec

File tree

530 files changed

+1951
-1931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

530 files changed

+1951
-1931
lines changed

‎toolchain/check/testdata/alias/fail_bool_value.carbon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// TIP: To dump output, run:
99
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/alias/fail_bool_value.carbon
1010

11-
// CHECK:STDERR: fail_bool_value.carbon:[[@LINE+3]]:11: error: alias initializer must be a name reference
11+
// CHECK:STDERR: fail_bool_value.carbon:[[@LINE+3]]:11: error(AliasRequiresNameRef): alias initializer must be a name reference
1212
// CHECK:STDERR: alias a = false;
1313
// CHECK:STDERR: ^~~~~
1414
alias a = false;

‎toolchain/check/testdata/alias/fail_builtins.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
// TIP: To dump output, run:
99
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/alias/fail_builtins.carbon
1010

11-
// CHECK:STDERR: fail_builtins.carbon:[[@LINE+4]]:11: error: alias initializer must be a name reference
11+
// CHECK:STDERR: fail_builtins.carbon:[[@LINE+4]]:11: error(AliasRequiresNameRef): alias initializer must be a name reference
1212
// CHECK:STDERR: alias a = i32;
1313
// CHECK:STDERR: ^~~
1414
// CHECK:STDERR:
1515
alias a = i32;
1616

17-
// CHECK:STDERR: fail_builtins.carbon:[[@LINE+3]]:11: error: alias initializer must be a name reference
17+
// CHECK:STDERR: fail_builtins.carbon:[[@LINE+3]]:11: error(AliasRequiresNameRef): alias initializer must be a name reference
1818
// CHECK:STDERR: alias b = bool;
1919
// CHECK:STDERR: ^~~~
2020
alias b = bool;

‎toolchain/check/testdata/alias/fail_control_flow.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
// TIP: To dump output, run:
99
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/alias/fail_control_flow.carbon
1010

11-
// CHECK:STDERR: fail_control_flow.carbon:[[@LINE+11]]:11: error: semantics TODO: `Control flow expressions are currently only supported inside functions.`
11+
// CHECK:STDERR: fail_control_flow.carbon:[[@LINE+11]]:11: error(SemanticsTodo): semantics TODO: `Control flow expressions are currently only supported inside functions.`
1212
// CHECK:STDERR: alias a = true or false;
1313
// CHECK:STDERR: ^~~~~~~
1414
// CHECK:STDERR:
15-
// CHECK:STDERR: fail_control_flow.carbon:[[@LINE+7]]:11: error: semantics TODO: `Control flow expressions are currently only supported inside functions.`
15+
// CHECK:STDERR: fail_control_flow.carbon:[[@LINE+7]]:11: error(SemanticsTodo): semantics TODO: `Control flow expressions are currently only supported inside functions.`
1616
// CHECK:STDERR: alias a = true or false;
1717
// CHECK:STDERR: ^~~~~~~~~~~~~
1818
// CHECK:STDERR:
19-
// CHECK:STDERR: fail_control_flow.carbon:[[@LINE+3]]:11: error: alias initializer must be a name reference
19+
// CHECK:STDERR: fail_control_flow.carbon:[[@LINE+3]]:11: error(AliasRequiresNameRef): alias initializer must be a name reference
2020
// CHECK:STDERR: alias a = true or false;
2121
// CHECK:STDERR: ^~~~~~~~~~~~~
2222
alias a = true or false;

‎toolchain/check/testdata/alias/no_prelude/export_name.carbon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ library "[[@TEST_NAME]]";
5353

5454
import library "export";
5555

56-
// CHECK:STDERR: fail_orig_name_not_in_export.carbon:[[@LINE+3]]:8: error: name `C` not found
56+
// CHECK:STDERR: fail_orig_name_not_in_export.carbon:[[@LINE+3]]:8: error(NameNotFound): name `C` not found
5757
// CHECK:STDERR: var c: C = {};
5858
// CHECK:STDERR: ^
5959
var c: C = {};

‎toolchain/check/testdata/alias/no_prelude/fail_aliased_name_in_diag.carbon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class D {}
1414
alias c = C;
1515
var d: D = {};
1616

17-
// CHECK:STDERR: fail_aliased_name_in_diag.carbon:[[@LINE+3]]:1: error: package `Core` implicitly referenced here, but not found
17+
// CHECK:STDERR: fail_aliased_name_in_diag.carbon:[[@LINE+3]]:1: error(CoreNotFound): package `Core` implicitly referenced here, but not found
1818
// CHECK:STDERR: let c_var: c = d;
1919
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~
2020
let c_var: c = d;

‎toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
namespace NS;
1212

1313
fn F() -> {} {
14-
// CHECK:STDERR: fail_local_in_namespace.carbon:[[@LINE+8]]:9: error: name `NS` not found
14+
// CHECK:STDERR: fail_local_in_namespace.carbon:[[@LINE+8]]:9: error(NameNotFound): name `NS` not found
1515
// CHECK:STDERR: alias NS.a = {};
1616
// CHECK:STDERR: ^~
1717
// CHECK:STDERR:
18-
// CHECK:STDERR: fail_local_in_namespace.carbon:[[@LINE+4]]:16: error: alias initializer must be a name reference
18+
// CHECK:STDERR: fail_local_in_namespace.carbon:[[@LINE+4]]:16: error(AliasRequiresNameRef): alias initializer must be a name reference
1919
// CHECK:STDERR: alias NS.a = {};
2020
// CHECK:STDERR: ^~
2121
// CHECK:STDERR:
2222
alias NS.a = {};
23-
// CHECK:STDERR: fail_local_in_namespace.carbon:[[@LINE+3]]:10: error: name `a` not found
23+
// CHECK:STDERR: fail_local_in_namespace.carbon:[[@LINE+3]]:10: error(NameNotFound): name `a` not found
2424
// CHECK:STDERR: return NS.a;
2525
// CHECK:STDERR: ^~~~
2626
return NS.a;

‎toolchain/check/testdata/alias/no_prelude/fail_modifiers.carbon‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@
1010

1111
class Class {}
1212

13-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+25]]:1: error: `abstract` not allowed on `alias` declaration
13+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+25]]:1: error(ModifierNotAllowedOnDeclaration): `abstract` not allowed on `alias` declaration
1414
// CHECK:STDERR: abstract base default final alias A = Class;
1515
// CHECK:STDERR: ^~~~~~~~
1616
// CHECK:STDERR:
17-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+21]]:10: error: `base` not allowed on declaration with `abstract`
17+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+21]]:10: error(ModifierNotAllowedWith): `base` not allowed on declaration with `abstract`
1818
// CHECK:STDERR: abstract base default final alias A = Class;
1919
// CHECK:STDERR: ^~~~
20-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+18]]:1: note: `abstract` previously appeared here
20+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+18]]:1: note(ModifierPrevious): `abstract` previously appeared here
2121
// CHECK:STDERR: abstract base default final alias A = Class;
2222
// CHECK:STDERR: ^~~~~~~~
2323
// CHECK:STDERR:
24-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+14]]:15: error: `default` not allowed on declaration with `abstract`
24+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+14]]:15: error(ModifierNotAllowedWith): `default` not allowed on declaration with `abstract`
2525
// CHECK:STDERR: abstract base default final alias A = Class;
2626
// CHECK:STDERR: ^~~~~~~
27-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+11]]:1: note: `abstract` previously appeared here
27+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+11]]:1: note(ModifierPrevious): `abstract` previously appeared here
2828
// CHECK:STDERR: abstract base default final alias A = Class;
2929
// CHECK:STDERR: ^~~~~~~~
3030
// CHECK:STDERR:
31-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+7]]:23: error: `final` not allowed on declaration with `abstract`
31+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+7]]:23: error(ModifierNotAllowedWith): `final` not allowed on declaration with `abstract`
3232
// CHECK:STDERR: abstract base default final alias A = Class;
3333
// CHECK:STDERR: ^~~~~
34-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1: note: `abstract` previously appeared here
34+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1: note(ModifierPrevious): `abstract` previously appeared here
3535
// CHECK:STDERR: abstract base default final alias A = Class;
3636
// CHECK:STDERR: ^~~~~~~~
3737
// CHECK:STDERR:
3838
abstract base default final alias A = Class;
3939

40-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1: error: `impl` not allowed on `alias` declaration
40+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1: error(ModifierNotAllowedOnDeclaration): `impl` not allowed on `alias` declaration
4141
// CHECK:STDERR: impl alias B = Class;
4242
// CHECK:STDERR: ^~~~
4343
// CHECK:STDERR:
4444
impl alias B = Class;
4545

46-
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: error: `extern` not allowed on `alias` declaration
46+
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: error(ModifierNotAllowedOnDeclaration): `extern` not allowed on `alias` declaration
4747
// CHECK:STDERR: extern alias C = Class;
4848
// CHECK:STDERR: ^~~~~~
4949
extern alias C = Class;

‎toolchain/check/testdata/alias/no_prelude/fail_name_conflict.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
class C {}
1212

1313
alias a = C;
14-
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE+7]]:5: error: duplicate name being declared in the same scope
14+
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE+7]]:5: error(NameDeclDuplicate): duplicate name being declared in the same scope
1515
// CHECK:STDERR: var a: C = {};
1616
// CHECK:STDERR: ^
17-
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE-4]]:7: note: name is previously declared here
17+
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE-4]]:7: note(NameDeclPrevious): name is previously declared here
1818
// CHECK:STDERR: alias a = C;
1919
// CHECK:STDERR: ^
2020
// CHECK:STDERR:
2121
var a: C = {};
2222

2323
var b: C = {};
24-
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE+6]]:7: error: duplicate name being declared in the same scope
24+
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE+6]]:7: error(NameDeclDuplicate): duplicate name being declared in the same scope
2525
// CHECK:STDERR: alias b = C;
2626
// CHECK:STDERR: ^
27-
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE-4]]:5: note: name is previously declared here
27+
// CHECK:STDERR: fail_name_conflict.carbon:[[@LINE-4]]:5: note(NameDeclPrevious): name is previously declared here
2828
// CHECK:STDERR: var b: C = {};
2929
// CHECK:STDERR: ^
3030
alias b = C;

‎toolchain/check/testdata/alias/no_prelude/fail_not_constant.carbon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
fn F() {
1212
var a: () = ();
1313
var b: ()* = &a;
14-
// CHECK:STDERR: fail_not_constant.carbon:[[@LINE+3]]:13: error: alias initializer must be a name reference
14+
// CHECK:STDERR: fail_not_constant.carbon:[[@LINE+3]]:13: error(AliasRequiresNameRef): alias initializer must be a name reference
1515
// CHECK:STDERR: alias c = *b;
1616
// CHECK:STDERR: ^~
1717
alias c = *b;

‎toolchain/check/testdata/alias/no_prelude/fail_params.carbon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// TIP: To dump output, run:
99
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/alias/no_prelude/fail_params.carbon
1010

11-
// CHECK:STDERR: fail_params.carbon:[[@LINE+7]]:8: error: `alias` declaration cannot have parameters
11+
// CHECK:STDERR: fail_params.carbon:[[@LINE+7]]:8: error(UnexpectedDeclNameParams): `alias` declaration cannot have parameters
1212
// CHECK:STDERR: alias A(T:! type) = T*;
1313
// CHECK:STDERR: ^~~~~~~~~~
1414
// CHECK:STDERR:
15-
// CHECK:STDERR: fail_params.carbon:[[@LINE+3]]:21: error: alias initializer must be a name reference
15+
// CHECK:STDERR: fail_params.carbon:[[@LINE+3]]:21: error(AliasRequiresNameRef): alias initializer must be a name reference
1616
// CHECK:STDERR: alias A(T:! type) = T*;
1717
// CHECK:STDERR: ^~
1818
alias A(T:! type) = T*;

0 commit comments

Comments
 (0)