From 83c02f21ea7e82476336bd12840b04e1462dc8f3 Mon Sep 17 00:00:00 2001 From: carblue Date: Fri, 30 Mar 2018 05:01:23 +0200 Subject: [PATCH] std.algorithm.iteration: Fix a -dip1000 compilable issue --- dip1000.mak | 8 ++++---- std/algorithm/iteration.d | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dip1000.mak b/dip1000.mak index a7b7e2b4efd..85fba72b9d2 100644 --- a/dip1000.mak +++ b/dip1000.mak @@ -59,8 +59,8 @@ aa[std.zlib]=-dip1000 aa[std.algorithm.comparison]=-dip1000 aa[std.algorithm.internal]=-dip1000 -aa[std.algorithm.iteration]=-dip25 # WIP_carblue -aa[std.algorithm.mutation]=-dip25 # depends on std.container.slist (https://github.com/dlang/phobos/pull/6295) +aa[std.algorithm.iteration]=-dip25 # depends on std.container.slist (to be updated https://github.com/dlang/phobos/pull/6295) +aa[std.algorithm.mutation]=-dip25 # depends on std.container.slist (to be updated https://github.com/dlang/phobos/pull/6295) aa[std.algorithm.package]=-dip1000 aa[std.algorithm.searching]=-dip25 # depends on https://github.com/dlang/phobos/pull/6246 merged and std.algorithm.comparison fixed aa[std.algorithm.setops]=-dip1000 @@ -95,8 +95,8 @@ aa[std.container.binaryheap]=-dip1000 aa[std.container.dlist]=-dip1000 aa[std.container.package]=-dip1000 aa[std.container.rbtree]=-dip25 # DROP -aa[std.container.slist]=-dip25 # -dip1000 -version=DIP1000 depends on https://github.com/dlang/phobos/pull/6295 merged -aa[std.container.util]=-dip25 # TODO +aa[std.container.slist]=-dip25 # -dip1000 -version=DIP1000 depends on an update (no insertFront's code duplication in constructor) and merge of https://github.com/dlang/phobos/pull/6295 +aa[std.container.util]=-dip25 # depends on rbtree and slist = -dip1000 aa[std.datetime.date]=-dip1000 aa[std.datetime.interval]=-dip1000 diff --git a/std/algorithm/iteration.d b/std/algorithm/iteration.d index dd208882fee..de052e6d26e 100644 --- a/std/algorithm/iteration.d +++ b/std/algorithm/iteration.d @@ -4236,7 +4236,7 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool) @property empty() { return _impl.empty; } @property auto front() { return _impl.front; } void popFront() { _impl = _impl[1..$]; } - @property RefSep save() { return new RefSep(_impl); } + @property RefSep save() scope { return new RefSep(_impl); } @property auto length() { return _impl.length; } } auto sep = new RefSep("->");