aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/std/meta/trait.zig8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/std/meta/trait.zig b/lib/std/meta/trait.zig
index 3be13057b5..31fee11260 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"),