From dc4fea983d358125a3b2a80dc169cad7649de6a9 Mon Sep 17 00:00:00 2001
From: data-man <datamanrb@gmail.com>
Date: Mon, 25 May 2020 07:44:24 +0500
Subject: [PATCH] Use tuples in multiTrait

---
 lib/std/meta/trait.zig | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/std/meta/trait.zig b/lib/std/meta/trait.zig
index 3be13057b500964d7c99dcd3486420f7ece659dc..31fee11260288ac4e5fc88166c56ad42d8a0bd93 100644
--- a/lib/std/meta/trait.zig
+++ b/lib/std/meta/trait.zig
@@ -9,11 +9,7 @@ const meta = @import("../meta.zig");
 
 pub const TraitFn = fn (type) bool;
 
-//////Trait generators
-
-// TODO convert to tuples when #4335 is done
-pub const TraitList = []const TraitFn;
-pub fn multiTrait(comptime traits: TraitList) TraitFn {
+pub fn multiTrait(comptime traits: var) TraitFn {
     const Closure = struct {
         pub fn trait(comptime T: type) bool {
             inline for (traits) |t|
@@ -39,7 +35,7 @@ test "std.meta.trait.multiTrait" {
         }
     };
 
-    const isVector = multiTrait(&[_]TraitFn{
+    const isVector = multiTrait(.{
         hasFn("add"),
         hasField("x"),
         hasField("y"),
-- 
2.54.0