mirror of
https://github.com/ziglang/zig.git
synced 2026-10-14 10:27:43 -04:00
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen
Conflicts:
* doc/langref.html.in
* lib/std/enums.zig
* lib/std/fmt.zig
* lib/std/hash/auto_hash.zig
* lib/std/math.zig
* lib/std/mem.zig
* lib/std/meta.zig
* test/behavior/alignof.zig
* test/behavior/bitcast.zig
* test/behavior/bugs/1421.zig
* test/behavior/cast.zig
* test/behavior/ptrcast.zig
* test/behavior/type_info.zig
* test/behavior/vector.zig
Master branch added `try` to a bunch of testing function calls, and some
lines also had changed how to refer to the native architecture and other
`@import("builtin")` stuff.
This commit is contained in:
commit
5619ce2406
408 files changed
+12487
-12478
No files matched your search
@@ -2,16 +2,16 @@ const std = @import("std");
|
||||
const expect = std.testing.expect;
|
||||
|
||||
test "@src" {
|
||||
doTheTest();
|
||||
try doTheTest();
|
||||
}
|
||||
|
||||
fn doTheTest() void {
|
||||
fn doTheTest() !void {
|
||||
const src = @src();
|
||||
|
||||
expect(src.line == 9);
|
||||
expect(src.column == 17);
|
||||
expect(std.mem.endsWith(u8, src.fn_name, "doTheTest"));
|
||||
expect(std.mem.endsWith(u8, src.file, "src.zig"));
|
||||
expect(src.fn_name[src.fn_name.len] == 0);
|
||||
expect(src.file[src.file.len] == 0);
|
||||
try expect(src.line == 9);
|
||||
try expect(src.column == 17);
|
||||
try expect(std.mem.endsWith(u8, src.fn_name, "doTheTest"));
|
||||
try expect(std.mem.endsWith(u8, src.file, "src.zig"));
|
||||
try expect(src.fn_name[src.fn_name.len] == 0);
|
||||
try expect(src.file[src.file.len] == 0);
|
||||
}
|
||||
Reference in new issue
Block a user