Skip to content

Commit 52b99f4

Browse files
authored
Merge pull request #6351 from carblue/std_functional
[Trivial]std.functional: -dip1000 compilable by @safe => @System unit…
2 parents 688da30 + 727c5cf commit 52b99f4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dip1000.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ aa[std.encoding]=-dip1000
2626
aa[std.exception]=-dip1000 # merged https://github.com/dlang/phobos/pull/6323; a workaround for https://issues.dlang.org/show_bug.cgi?id=18637
2727
aa[std.file]=-dip25 # probably already fixed (std.uni); currently: undefined symbol pure nothrow @nogc return @safe std.uni.SliceOverIndexed!(std.uni.Grapheme).SliceOverIndexed std.uni.SliceOverIndexed!(std.uni.Grapheme).SliceOverIndexed.opSlice()
2828
aa[std.format]=-dip25 # @system function std.range.primitives.put
29-
aa[std.functional]=-dip25 # DROP: cannot call @system function std.functional.__unittest_L1216_C7.memoize!(pickFirst).memoize
29+
aa[std.functional]=-dip1000 # merged https://github.com/dlang/phobos/pull/6351
3030
aa[std.getopt]=-dip1000
3131
aa[std.json]=-dip1000
3232
aa[std.math]=-dip1000

std/functional.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,7 @@ template memoize(alias fun, uint maxSize)
11941194
}
11951195

11961196
// 16079: memoize should work with arrays
1197-
@safe unittest
1197+
@system unittest // not @safe with -dip1000 due to memoize
11981198
{
11991199
int executed = 0;
12001200
T median(T)(const T[] nums) {
@@ -1237,7 +1237,7 @@ template memoize(alias fun, uint maxSize)
12371237
}
12381238

12391239
// 16079: memoize should work with classes
1240-
@safe unittest
1240+
@system unittest // not @safe with -dip1000 due to memoize
12411241
{
12421242
int executed = 0;
12431243
T pickFirst(T)(T first)

0 commit comments

Comments
 (0)