motiejus/zig
1
Fork 0
Code Releases Activity

fix merge conflicts for this branch

Browse Source
This commit is contained in:
Andrew Kelley
2021-09-01 17:01:35 -07:00
parent 5356151172
commit 46f93807aa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/langref.html.in
View File

@@ -258,7 +258,7 @@ pub fn main() !void {
<p>
The code sample begins by adding Zig's Standard Library to the build using the {#link|@import#} builtin function.
The {#syntax#}@import("std"){#endsyntax#} function call creates a structure to represent the Standard Library.
The code then {#link|declares|Container level Variables#} a
The code then declares a
{#link|constant identifier|Assignment#}, named <code>std</code>, for easy access to
<a href="https://github.com/ziglang/zig/wiki/FAQ#where-is-the-documentation-for-the-zig-standard-library">Zig's standard library</a>.
</p>
@@ -927,8 +927,8 @@ fn foo() i32 {
const expect = std.testing.expect;
test "static local variable" {
expect(foo() == 1235);
expect(foo() == 1236);
try expect(foo() == 1235);
try expect(foo() == 1236);
}
fn foo() i32 {

8
test/behavior/vector.zig
View File

@@ -638,10 +638,10 @@ test "mask parameter of @shuffle is comptime scope" {
var v4_a = __v4hi{ 0, 0, 0, 0 };
var v4_b = __v4hi{ 0, 0, 0, 0 };
var shuffled: __v4hi = @shuffle(i16, v4_a, v4_b, std.meta.Vector(4, i32){
std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
std.meta.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
});
_ = shuffled;
}