Merge remote-tracking branch 'origin/master' into rewrite-coroutines

2019-08-13 11:39:32 -04:00
parent 24d5ec0783 98183e4743
commit 8a9289996a
16 changed files with 207 additions and 56 deletions
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -3292,14 +3292,6 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
        "tmp.zig:3:17: note: value 8 cannot fit into type u3",
    );

-    cases.add(
-        "incompatible number literals",
-        \\const x = 2 == 2.0;
-        \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
-    ,
-        "tmp.zig:1:11: error: integer value 2 cannot be implicitly casted to type 'comptime_float'",
-    );
-
    cases.add(
        "missing function call param",
        \\const Foo = struct {