Merge pull request #15508 from r00ster91/semathings

Sema: fixes to error messages

7 files changed, 19 insertions, 14 deletions

diff --git a/test/cases/compile_errors/array_access_of_non_array.zig b/test/cases/compile_errors/array_access_of_non_array.zig
index 06fa1569e6..0f06bae1dd 100644
--- a/test/cases/compile_errors/array_access_of_non_array.zig
+++ b/test/cases/compile_errors/array_access_of_non_array.zig
@@ -1,9 +1,9 @@
 export fn f() void {
-    var bad : bool = undefined;
+    var bad: bool = undefined;
     bad[0] = bad[0];
 }
 export fn g() void {
-    var bad : bool = undefined;
+    var bad: bool = undefined;
     _ = bad[0];
 }
 
@@ -11,5 +11,7 @@ export fn g() void {
 // backend=stage2
 // target=native
 //
-// :3:8: error: element access of non-indexable type 'bool'
-// :7:12: error: element access of non-indexable type 'bool'
+// :3:8: error: type 'bool' does not support indexing
+// :3:8: note: operand must be an array, slice, tuple, or vector
+// :7:12: error: type 'bool' does not support indexing
+// :7:12: note: operand must be an array, slice, tuple, or vector
diff --git a/test/cases/compile_errors/array_access_of_type.zig b/test/cases/compile_errors/array_access_of_type.zig
index d38a13b2fa..1e66ca3776 100644
--- a/test/cases/compile_errors/array_access_of_type.zig
+++ b/test/cases/compile_errors/array_access_of_type.zig
@@ -7,4 +7,5 @@ export fn foo() void {
 // backend=stage2
 // target=native
 //
-// :2:14: error: element access of non-indexable type 'type'
+// :2:14: error: type 'type' does not support indexing
+// :2:14: note: operand must be an array, slice, tuple, or vector
diff --git a/test/cases/compile_errors/compile_time_null_ptr_cast.zig b/test/cases/compile_errors/compile_time_null_ptr_cast.zig
index d3750c8654..25805e9f35 100644
--- a/test/cases/compile_errors/compile_time_null_ptr_cast.zig
+++ b/test/cases/compile_errors/compile_time_null_ptr_cast.zig
@@ -8,4 +8,4 @@ comptime {
 // backend=llvm
 // target=native
 //
-// :3:32: error: null pointer casted to type *i32
+// :3:32: error: null pointer casted to type '*i32'
diff --git a/test/cases/compile_errors/for.zig b/test/cases/compile_errors/for.zig
index 5bd3aa0c64..435bb68607 100644
--- a/test/cases/compile_errors/for.zig
+++ b/test/cases/compile_errors/for.zig
@@ -31,8 +31,8 @@ export fn d() void {
 // :2:5: error: non-matching for loop lengths
 // :2:11: note: length 10 here
 // :2:19: note: length 11 here
-// :9:14: error: type 'bool' does not support indexing
-// :9:14: note: for loop operand must be an array, slice, tuple, or vector
+// :9:14: error: type 'bool' is not indexable and not a range
+// :9:14: note: for loop operand must be a range, array, slice, tuple, or vector
 // :15:16: error: pointer capture of non pointer type '[10]u8'
 // :15:10: note: consider using '&' here
 // :22:5: error: unbounded for loop
diff --git a/test/cases/compile_errors/incorrect_type_to_memset_memcpy.zig b/test/cases/compile_errors/incorrect_type_to_memset_memcpy.zig
index 910ec807a8..2a4990b1ec 100644
--- a/test/cases/compile_errors/incorrect_type_to_memset_memcpy.zig
+++ b/test/cases/compile_errors/incorrect_type_to_memset_memcpy.zig
@@ -25,12 +25,12 @@ pub export fn non_matching_lengths() void {
 // target=native
 //
 // :5:5: error: unknown @memcpy length
-// :5:18: note: destination type [*]u8 provides no length
-// :5:24: note: source type [*]align(4) const u8 provides no length
+// :5:18: note: destination type '[*]u8' provides no length
+// :5:24: note: source type '[*]align(4) const u8' provides no length
 // :10:13: error: type 'u8' does not support indexing
-// :10:13: note: for loop operand must be an array, slice, tuple, or vector
+// :10:13: note: operand must be an array, slice, tuple, or vector
 // :15:13: error: type '*u8' does not support indexing
-// :15:13: note: for loop operand must be an array, slice, tuple, or vector
+// :15:13: note: operand must be an array, slice, tuple, or vector
 // :20:5: error: non-matching @memcpy lengths
 // :20:13: note: length 6 here
 // :20:20: note: length 5 here
diff --git a/test/cases/compile_errors/indexing_non-tuple_struct.zig b/test/cases/compile_errors/indexing_non-tuple_struct.zig
index 912ee689d1..1691faaae0 100644
--- a/test/cases/compile_errors/indexing_non-tuple_struct.zig
+++ b/test/cases/compile_errors/indexing_non-tuple_struct.zig
@@ -8,4 +8,5 @@ export fn a() void {
 // backend=stage2
 // target=native
 //
-// :4:6: error: element access of non-indexable type 'tmp.a.S'
+// :4:6: error: type 'tmp.a.S' does not support indexing
+// :4:6: note: operand must be an array, slice, tuple, or vector
diff --git a/test/cases/compile_errors/indexing_single-item_pointer.zig b/test/cases/compile_errors/indexing_single-item_pointer.zig
index efd063817c..41b94c8f26 100644
--- a/test/cases/compile_errors/indexing_single-item_pointer.zig
+++ b/test/cases/compile_errors/indexing_single-item_pointer.zig
@@ -6,4 +6,5 @@ export fn entry(ptr: *i32) i32 {
 // backend=stage2
 // target=native
 //
-// :2:15: error: element access of non-indexable type '*i32'
+// :2:15: error: type '*i32' does not support indexing
+// :2:15: note: operand must be an array, slice, tuple, or vector