# Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/5619ce2406a545e177882415195575463989066d)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: 5619ce2406a545e177882415195575463989066d

Requested commit: 5619ce2406a545e177882415195575463989066d

Commit: 5619ce2406a545e177882415195575463989066d

Tree: 5c0e786d19054a56ae42272713de321e25d2efc8

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
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.

```

## Parents

- [5cd9afc6b6cf33f650e5afc6b726b91dfb97e697](https://git.cafe/gitcafe/zig/commit/5cd9afc6b6cf33f650e5afc6b726b91dfb97e697?format=markdown)

- [67154d233ef68d9fd63e673e63e7d66f149060a5](https://git.cafe/gitcafe/zig/commit/67154d233ef68d9fd63e673e63e7d66f149060a5?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/5619ce2406a545e177882415195575463989066d?format=markdown)