aboutsummaryrefslogtreecommitdiff
path: root/test/stage1
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-06-19 15:18:51 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-06-19 15:18:51 -0400
commite36680d3bd08fceb3e976edeafae60ce6d577342 (patch)
tree60ca93229fabd17136dd6aa2389ba9d2c95ed6b7 /test/stage1
parentb588a803bf4493d2fd1892fe172b9ce8cfb0ca30 (diff)
downloadzig-e36680d3bd08fceb3e976edeafae60ce6d577342.tar.gz
zig-e36680d3bd08fceb3e976edeafae60ce6d577342.zip
fix detection of unable to evaluate constant expression
Diffstat (limited to 'test/stage1')
-rw-r--r--test/stage1/behavior.zig2
-rw-r--r--test/stage1/behavior/cast.zig36
2 files changed, 19 insertions, 19 deletions
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
index 77fc482ccc..5ad6b94f3f 100644
--- a/test/stage1/behavior.zig
+++ b/test/stage1/behavior.zig
@@ -40,7 +40,7 @@ comptime {
_ = @import("behavior/bugs/920.zig");
_ = @import("behavior/byval_arg_var.zig");
//_ = @import("behavior/cancel.zig");
- _ = @import("behavior/cast.zig"); // TODO
+ _ = @import("behavior/cast.zig");
_ = @import("behavior/const_slice_child.zig");
//_ = @import("behavior/coroutine_await_struct.zig");
//_ = @import("behavior/coroutines.zig");
diff --git a/test/stage1/behavior/cast.zig b/test/stage1/behavior/cast.zig
index c148523a72..0a2ffb6c2f 100644
--- a/test/stage1/behavior/cast.zig
+++ b/test/stage1/behavior/cast.zig
@@ -165,10 +165,10 @@ fn castToOptionalSlice() ?[]const u8 {
return "hi";
}
-//test "implicitly cast from [0]T to anyerror![]T" {
-// testCastZeroArrayToErrSliceMut();
-// comptime testCastZeroArrayToErrSliceMut();
-//}
+test "implicitly cast from [0]T to anyerror![]T" {
+ testCastZeroArrayToErrSliceMut();
+ comptime testCastZeroArrayToErrSliceMut();
+}
fn testCastZeroArrayToErrSliceMut() void {
expect((gimmeErrOrSlice() catch unreachable).len == 0);
@@ -178,20 +178,20 @@ fn gimmeErrOrSlice() anyerror![]u8 {
return [_]u8{};
}
-//test "peer type resolution: [0]u8, []const u8, and anyerror![]u8" {
-// {
-// var data = "hi";
-// const slice = data[0..];
-// expect((try peerTypeEmptyArrayAndSliceAndError(true, slice)).len == 0);
-// expect((try peerTypeEmptyArrayAndSliceAndError(false, slice)).len == 1);
-// }
-// comptime {
-// var data = "hi";
-// const slice = data[0..];
-// expect((try peerTypeEmptyArrayAndSliceAndError(true, slice)).len == 0);
-// expect((try peerTypeEmptyArrayAndSliceAndError(false, slice)).len == 1);
-// }
-//}
+test "peer type resolution: [0]u8, []const u8, and anyerror![]u8" {
+ {
+ var data = "hi";
+ const slice = data[0..];
+ expect((try peerTypeEmptyArrayAndSliceAndError(true, slice)).len == 0);
+ expect((try peerTypeEmptyArrayAndSliceAndError(false, slice)).len == 1);
+ }
+ comptime {
+ var data = "hi";
+ const slice = data[0..];
+ expect((try peerTypeEmptyArrayAndSliceAndError(true, slice)).len == 0);
+ expect((try peerTypeEmptyArrayAndSliceAndError(false, slice)).len == 1);
+ }
+}
fn peerTypeEmptyArrayAndSliceAndError(a: bool, slice: []u8) anyerror![]u8 {
if (a) {
return [_]u8{};