aboutsummaryrefslogtreecommitdiff
path: root/lib/std/multi_array_list.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-03-04 18:23:11 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-03-04 18:23:11 -0700
commitbccef441963434b452a623abbb9315fd92c1e255 (patch)
tree4c0ea89b8fa895b3d34749ec089e45438d79466b /lib/std/multi_array_list.zig
parent0c06a1885fad9a9bb85342632a0b7c8a3a0733e9 (diff)
parent041212a41cfaf029dc3eb9740467b721c76f406c (diff)
downloadzig-bccef441963434b452a623abbb9315fd92c1e255.tar.gz
zig-bccef441963434b452a623abbb9315fd92c1e255.zip
Merge remote-tracking branch 'origin/master' into llvm12
Syncing with master branch because I want to re-run update_clang_options.zig in the llvm12 branch.
Diffstat (limited to 'lib/std/multi_array_list.zig')
-rw-r--r--lib/std/multi_array_list.zig2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/std/multi_array_list.zig b/lib/std/multi_array_list.zig
index 3306fd3ef0..99a9fff7f0 100644
--- a/lib/std/multi_array_list.zig
+++ b/lib/std/multi_array_list.zig
@@ -136,7 +136,7 @@ pub fn MultiArrayList(comptime S: type) type {
const slices = self.slice();
var result: S = undefined;
inline for (fields) |field_info, i| {
- @field(elem, field_info.name) = slices.items(@intToEnum(Field, i))[index];
+ @field(result, field_info.name) = slices.items(@intToEnum(Field, i))[index];
}
return result;
}