From 46f93807aaf4d9c1ea2000cda5ad46ea6f212b3e Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 1 Sep 2021 17:01:35 -0700
Subject: [PATCH] fix merge conflicts for this branch

---
 doc/langref.html.in      | 6 +++---
 test/behavior/vector.zig | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/langref.html.in b/doc/langref.html.in
index 9ece339172..66cc756f09 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -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 {
diff --git a/test/behavior/vector.zig b/test/behavior/vector.zig
index 85cdba224e..4a2042b0c5 100644
--- a/test/behavior/vector.zig
+++ b/test/behavior/vector.zig
@@ -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;
 }