diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-05-08 14:45:21 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-05-08 14:45:21 -0700 |
| commit | 5619ce2406a545e177882415195575463989066d (patch) | |
| tree | 5c0e786d19054a56ae42272713de321e25d2efc8 /src/Module.zig | |
| parent | 5cd9afc6b6cf33f650e5afc6b726b91dfb97e697 (diff) | |
| parent | 67154d233ef68d9fd63e673e63e7d66f149060a5 (diff) | |
| download | zig-5619ce2406a545e177882415195575463989066d.tar.gz zig-5619ce2406a545e177882415195575463989066d.zip | |
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.
Diffstat (limited to 'src/Module.zig')
0 files changed, 0 insertions, 0 deletions