aboutsummaryrefslogtreecommitdiff
path: root/test/cases/compile_errors
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-07-05 16:24:18 -0700
committerAndrew Kelley <andrew@ziglang.org>2022-07-05 16:24:18 -0700
commit9a5c7b4b4d12a4ad90f10fafc5fa6b34d99549bb (patch)
tree6d4a7041c742bf6f92ee731e6d3b6efbb530a520 /test/cases/compile_errors
parente8ce1728e98bbdf4a13b2a2a3a87f5b2c32d26dd (diff)
parentf639cb33a9acf71e32fb69882cf59250148cfaff (diff)
downloadzig-9a5c7b4b4d12a4ad90f10fafc5fa6b34d99549bb.tar.gz
zig-9a5c7b4b4d12a4ad90f10fafc5fa6b34d99549bb.zip
Merge remote-tracking branch 'origin/master' into llvm14
Diffstat (limited to 'test/cases/compile_errors')
-rw-r--r--test/cases/compile_errors/asm_at_compile_time.zig3
-rw-r--r--test/cases/compile_errors/duplicate_error_in_switch.zig6
2 files changed, 5 insertions, 4 deletions
diff --git a/test/cases/compile_errors/asm_at_compile_time.zig b/test/cases/compile_errors/asm_at_compile_time.zig
index ba4aa81170..601c89da9e 100644
--- a/test/cases/compile_errors/asm_at_compile_time.zig
+++ b/test/cases/compile_errors/asm_at_compile_time.zig
@@ -14,4 +14,5 @@ fn doSomeAsm() void {
// backend=llvm
// target=native
//
-// :6:5: error: unable to evaluate constant expression
+// :6:5: error: unable to resolve comptime value
+// :2:14: note: called from here
diff --git a/test/cases/compile_errors/duplicate_error_in_switch.zig b/test/cases/compile_errors/duplicate_error_in_switch.zig
index 6e9b1e9099..aaaed396fa 100644
--- a/test/cases/compile_errors/duplicate_error_in_switch.zig
+++ b/test/cases/compile_errors/duplicate_error_in_switch.zig
@@ -8,8 +8,8 @@ export fn entry() void {
}
fn foo(x: i32) !void {
switch (x) {
- 0 ... 10 => return error.Foo,
- 11 ... 20 => return error.Bar,
+ 0...10 => return error.Foo,
+ 11...20 => return error.Bar,
else => {},
}
}
@@ -19,4 +19,4 @@ fn foo(x: i32) !void {
// target=native
//
// :5:9: error: duplicate switch value
-// :3:9: note: other value here
+// :3:9: note: previous value here