mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-29 22:50:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2690 from 9il/splitter

Browse source 
deprecate splitter in std.array
This commit is contained in:
H. S. Teoh 2014-11-14 07:18:47 -08:00
commit c9e1a58a8a
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
std/array.d
View file

@ -15,7 +15,7 @@ module std.array;
import std.traits; import std.traits;
import std.typetuple; import std.typetuple;
import std.functional; import std.functional;
import std.algorithm; // FIXME (see alias below) static import std.algorithm; // FIXME, remove with alias of splitter
import std.range.constraints; import std.range.constraints;
public import std.range.constraints : save, empty, popFront, popBack, front, back; public import std.range.constraints : save, empty, popFront, popBack, front, back;
@ -1294,7 +1294,7 @@ unittest //safety, purity, ctfe ...
/++ /++
Alias for $(XREF algorithm, splitter). Alias for $(XREF algorithm, splitter).
+/ +/
alias splitter = std.algorithm.splitter; deprecated("Please use std.algorithm.splitter instead.") alias splitter = std.algorithm.splitter;
/++ /++
Eagerly splits $(D s) into an array, using $(D delim) as the delimiter. Eagerly splits $(D s) into an array, using $(D delim) as the delimiter.
@ -2040,10 +2040,13 @@ if (isDynamicArray!(E[]) &&
static if(isSomeString!(E[])) static if(isSomeString!(E[]))
{ {
import std.string : indexOf; import std.string : indexOf;
auto idx = subject.indexOf(from); immutable idx = subject.indexOf(from);
} }
else else
auto idx = subject.countUntil(from); {
import std.algorithm : countUntil;
immutable idx = subject.countUntil(from);
}
if (idx == -1) if (idx == -1)
return subject; return subject;
@ -2054,10 +2057,10 @@ if (isDynamicArray!(E[]) &&
static if(isSomeString!(E[]) && isSomeString!R1) static if(isSomeString!(E[]) && isSomeString!R1)
{ {
import std.utf : codeLength; import std.utf : codeLength;
auto fromLength = codeLength!(Unqual!E, R1)(from); immutable fromLength = codeLength!(Unqual!E, R1)(from);
} }
else else
auto fromLength = from.length; immutable fromLength = from.length;
app.put(subject[idx + fromLength .. $]); app.put(subject[idx + fromLength .. $]);