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.

1 files changed, 4 insertions, 4 deletions

diff --git a/test/behavior/pub_enum.zig b/test/behavior/pub_enum.zig
index 0613df94d9..d2e887b12e 100644
--- a/test/behavior/pub_enum.zig
+++ b/test/behavior/pub_enum.zig
@@ -2,12 +2,12 @@ const other = @import("pub_enum/other.zig");
 const expect = @import("std").testing.expect;
 
 test "pub enum" {
-    pubEnumTest(other.APubEnum.Two);
+    try pubEnumTest(other.APubEnum.Two);
 }
-fn pubEnumTest(foo: other.APubEnum) void {
-    expect(foo == other.APubEnum.Two);
+fn pubEnumTest(foo: other.APubEnum) !void {
+    try expect(foo == other.APubEnum.Two);
 }
 
 test "cast with imported symbol" {
-    expect(@as(other.size_t, 42) == 42);
+    try expect(@as(other.size_t, 42) == 42);
 }