mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-11 23:05:34 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #3649 from DmitryOlshansky/poita--issue14817

Browse source 
[REG master] Issue14817 std.algorithm.copy/std.file.copy conflict
This commit is contained in:
Steven Schveighoffer 2015-09-18 09:22:01 -04:00
commit edc405cacd
2 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

27
std/algorithm/mutation.d
View file

@ -71,7 +71,7 @@ T2=$(TR $(TDNW $(LREF $1)) $(TD $+))
module std.algorithm.mutation;
import std.range.primitives;
import std.traits : isBlitAssignable, isNarrowString;
import std.traits : isArray, isBlitAssignable, isNarrowString, Unqual;
// FIXME
import std.typecons; // : tuple, Tuple;
@ -283,6 +283,10 @@ Elements can be swapped across ranges of different types:
}
}
// Tests if types are arrays and support slice assign.
private enum bool areCopyCompatibleArrays(T1, T2) =
isArray!T1 && isArray!T2 && is(typeof(T2.init[] = T1.init[]));
// copy
/**
Copies the content of $(D source) into $(D target) and returns the
@ -295,11 +299,8 @@ See_Also:
$(WEB sgi.com/tech/stl/_copy.html, STL's _copy)
*/
TargetRange copy(SourceRange, TargetRange)(SourceRange source, TargetRange target)
if (areCopyCompatibleArrays!(SourceRange, TargetRange))
{
import std.traits : isArray, Unqual;
static if (isArray!SourceRange && isArray!TargetRange &&
is(Unqual!(typeof(source[0])) == Unqual!(typeof(target[0]))))
{
const tlen = target.length;
const slen = source.length;
assert(tlen >= slen,
@ -323,10 +324,14 @@ TargetRange copy(SourceRange, TargetRange)(SourceRange source, TargetRange targe
target[0 .. slen] = source[];
return target[slen .. $];
}
}
else static if (isInputRange!SourceRange &&
}
/// ditto
TargetRange copy(SourceRange, TargetRange)(SourceRange source, TargetRange target)
if (!areCopyCompatibleArrays!(SourceRange, TargetRange) &&
isInputRange!SourceRange &&
isOutputRange!(TargetRange, ElementType!SourceRange))
{
{
// Specialize for 2 random access ranges.
// Typically 2 random access ranges are faster iterated by common
// index than by x.popFront(), y.popFront() pair
@ -346,12 +351,6 @@ TargetRange copy(SourceRange, TargetRange)(SourceRange source, TargetRange targe
put(target, source);
return target;
}
}
else
{
static assert(false, "Cannot copy " ~ SourceRange.stringof ~
" into " ~ TargetRange.stringof);
}
}
///

1
std/file.d
View file

@ -2887,6 +2887,7 @@ private void copyImpl(const(char)[] f, const(char)[] t, const(FSChar)* fromz, co
unittest
{
import std.algorithm, std.file; // issue 14817
auto t1 = deleteme, t2 = deleteme~"2";
scope(exit) foreach (t; [t1, t2]) if (t.exists) t.remove();
write(t1, "1");