From adfedc364cc3b77a8f1987240446d7e55dc9922c Mon Sep 17 00:00:00 2001
From: KlausC <klausC@users.noreply.github.com>
Date: Tue, 3 Sep 2024 11:39:23 +0200
Subject: [PATCH] no empty varargs

---
 src/groups.jl          | 20 +++++++++++---------
 test/ExecutionTests.jl |  9 +++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/groups.jl b/src/groups.jl
index c1022a80..be08ca2c 100644
--- a/src/groups.jl
+++ b/src/groups.jl
@@ -82,17 +82,19 @@ Base.iterate(group::BenchmarkGroup, i=1) = iterate(group.data, i)
 andexpr(a, b) = :($a && $b)
 andreduce(preds) = reduce(andexpr, preds)
 
-function mapvals!(f, dest::BenchmarkGroup, srcs::BenchmarkGroup...)
-    for k in keys(first(srcs))
+function mapvals!(f, dest::BenchmarkGroup, src::BenchmarkGroup, srcs::BenchmarkGroup...)
+    for k in keys(src)
         if all(s -> haskey(s, k), srcs)
-            dest[k] = f((s[k] for s in srcs)...)
+            dest[k] = f(src[k], (s[k] for s in srcs)...)
         end
     end
     return dest
 end
 
 mapvals!(f, group::BenchmarkGroup) = mapvals!(f, similar(group), group)
-mapvals(f, groups::BenchmarkGroup...) = mapvals!(f, similar(first(groups)), groups...)
+function mapvals(f, group::BenchmarkGroup, groups::BenchmarkGroup...)
+    return mapvals!(f, similar(group), group, groups...)
+end
 
 filtervals!(f, group::BenchmarkGroup) = (filter!(kv -> f(kv[2]), group.data); return group)
 filtervals(f, group::BenchmarkGroup) = filtervals!(f, copy(group))
@@ -109,8 +111,8 @@ Statistics.mean(group::BenchmarkGroup) = mapvals(mean, group)
 Statistics.median(group::BenchmarkGroup) = mapvals(median, group)
 Statistics.std(group::BenchmarkGroup) = mapvals(std, group)
 Statistics.var(group::BenchmarkGroup) = mapvals(var, group)
-Base.min(groups::BenchmarkGroup...) = mapvals(min, groups...)
-Base.max(groups::BenchmarkGroup...) = mapvals(max, groups...)
+Base.min(group::BenchmarkGroup, groups::BenchmarkGroup...) = mapvals(min, group, groups...)
+Base.max(group::BenchmarkGroup, groups::BenchmarkGroup...) = mapvals(max, group, groups...)
 
 Base.time(group::BenchmarkGroup) = mapvals(time, group)
 gctime(group::BenchmarkGroup) = mapvals(gctime, group)
@@ -118,9 +120,9 @@ memory(group::BenchmarkGroup) = mapvals(memory, group)
 allocs(group::BenchmarkGroup) = mapvals(allocs, group)
 params(group::BenchmarkGroup) = mapvals(params, group)
 
-ratio(groups::BenchmarkGroup...) = mapvals(ratio, groups...)
-function judge(groups::BenchmarkGroup...; kwargs...)
-    return mapvals((x...) -> judge(x...; kwargs...), groups...)
+ratio(group::BenchmarkGroup, groups::BenchmarkGroup...) = mapvals(ratio, group, groups...)
+function judge(group::BenchmarkGroup, groups::BenchmarkGroup...; kwargs...)
+    return mapvals((x...) -> judge(x...; kwargs...), group, groups...)
 end
 
 rmskew!(group::BenchmarkGroup) = mapvals!(rmskew!, group)
diff --git a/test/ExecutionTests.jl b/test/ExecutionTests.jl
index 57666815..d6bfb17c 100644
--- a/test/ExecutionTests.jl
+++ b/test/ExecutionTests.jl
@@ -382,4 +382,13 @@ b = x = nothing
 GC.gc()
 @test x_finalized
 
+# Ensure mapvals(f) throws MethodError
+@test_throws MethodError BenchmarkTools.mapvals(max)
+
+# Ensure those function are not defined without arguments
+@test_throws MethodError max()
+@test_throws MethodError min()
+@test_throws MethodError ratio()
+@test_throws MethodError judge()
+
 end # module