diff options
Diffstat (limited to 'libphobos/src/std/algorithm')
| -rw-r--r-- | libphobos/src/std/algorithm/iteration.d | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/libphobos/src/std/algorithm/iteration.d b/libphobos/src/std/algorithm/iteration.d index 8a3add3..f8e1c05 100644 --- a/libphobos/src/std/algorithm/iteration.d +++ b/libphobos/src/std/algorithm/iteration.d @@ -446,35 +446,21 @@ if (fun.length >= 1) auto map(Range)(Range r) if (isInputRange!(Unqual!Range)) { - import std.meta : AliasSeq, staticMap; + import std.meta : staticMap; + import std.functional : adjoin; alias RE = ElementType!(Range); - static if (fun.length > 1) - { - import std.functional : adjoin; - import std.meta : staticIndexOf; - alias _funs = staticMap!(unaryFun, fun); - alias _fun = adjoin!_funs; + alias _funs = staticMap!(unaryFun, fun); + alias _fun = adjoin!_funs; - // Once https://issues.dlang.org/show_bug.cgi?id=5710 is fixed - // accross all compilers (as of 2020-04, it wasn't fixed in LDC and GDC), - // this validation loop can be moved into a template. - foreach (f; _funs) - { - static assert(!is(typeof(f(RE.init)) == void), - "Mapping function(s) must not return void: " ~ _funs.stringof); - } - } - else + // Once https://issues.dlang.org/show_bug.cgi?id=5710 is fixed + // accross all compilers (as of 2020-04, it wasn't fixed in LDC and GDC), + // this validation loop can be moved into a template. + foreach (f; _funs) { - alias _fun = unaryFun!fun; - alias _funs = AliasSeq!(_fun); - - // Do the validation separately for single parameters due to - // https://issues.dlang.org/show_bug.cgi?id=15777. - static assert(!is(typeof(_fun(RE.init)) == void), - "Mapping function(s) must not return void: " ~ _funs.stringof); + static assert(!is(typeof(f(RE.init)) == void), + "Mapping function(s) must not return void: " ~ _funs.stringof); } return MapResult!(_fun, Range)(r); |