authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-09-01 17:01:35-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-09-01 17:01:35-07:00
log46f93807aaf4d9c1ea2000cda5ad46ea6f212b3e
tree4e9d264e22c11b520fbf1cf934971feb2d09a568
parent53561511721f0cced078afc4188f7c8399170133

fix merge conflicts for this branch

2 files changed, 7 insertions(+), 7 deletions(-)

doc/langref.html.in+3-3
...@@ -258,7 +258,7 @@ pub fn main() !void {...@@ -258,7 +258,7 @@ pub fn main() !void {
258 <p>258 <p>
259 The code sample begins by adding Zig's Standard Library to the build using the {#link|@import#} builtin function.259 The code sample begins by adding Zig's Standard Library to the build using the {#link|@import#} builtin function.
260 The {#syntax#}@import("std"){#endsyntax#} function call creates a structure to represent the Standard Library.260 The {#syntax#}@import("std"){#endsyntax#} function call creates a structure to represent the Standard Library.
261 The code then {#link|declares|Container level Variables#} a261 The code then declares a
262 {#link|constant identifier|Assignment#}, named <code>std</code>, for easy access to262 {#link|constant identifier|Assignment#}, named <code>std</code>, for easy access to
263 <a href="https://github.com/ziglang/zig/wiki/FAQ#where-is-the-documentation-for-the-zig-standard-library">Zig's standard library</a>.263 <a href="https://github.com/ziglang/zig/wiki/FAQ#where-is-the-documentation-for-the-zig-standard-library">Zig's standard library</a>.
264 </p>264 </p>
...@@ -927,8 +927,8 @@ fn foo() i32 {...@@ -927,8 +927,8 @@ fn foo() i32 {
927 const expect = std.testing.expect;927 const expect = std.testing.expect;
928 928
929 test "static local variable" {929 test "static local variable" {
930 expect(foo() == 1235);930 try expect(foo() == 1235);
931 expect(foo() == 1236);931 try expect(foo() == 1236);
932 }932 }
933 933
934 fn foo() i32 {934 fn foo() i32 {
test/behavior/vector.zig+4-4
...@@ -638,10 +638,10 @@ test "mask parameter of @shuffle is comptime scope" {...@@ -638,10 +638,10 @@ test "mask parameter of @shuffle is comptime scope" {
638 var v4_a = __v4hi{ 0, 0, 0, 0 };638 var v4_a = __v4hi{ 0, 0, 0, 0 };
639 var v4_b = __v4hi{ 0, 0, 0, 0 };639 var v4_b = __v4hi{ 0, 0, 0, 0 };
640 var shuffled: __v4hi = @shuffle(i16, v4_a, v4_b, std.meta.Vector(4, i32){640 var shuffled: __v4hi = @shuffle(i16, v4_a, v4_b, std.meta.Vector(4, i32){
641 std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),641 std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
642 std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),642 std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
643 std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),643 std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
644 std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),644 std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
645 });645 });
646 _ = shuffled;646 _ = shuffled;
647}647}