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

Fix safety of withDefaultExtension for implicitly convertible types.

Browse source
This commit is contained in:
Jonathan M Davis 2018-01-27 20:37:15 -07:00
parent 32e4e8ab13
commit 8d158d3a1d
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
std/path.d
View file

@ -1331,17 +1331,27 @@ if (isSomeChar!C1 && is(Unqual!C1 == Unqual!C2))
* range with the result * range with the result
*/ */
auto withDefaultExtension(R, C)(R path, C[] ext) auto withDefaultExtension(R, C)(R path, C[] ext)
if ((isRandomAccessRange!R && hasSlicing!R && hasLength!R && isSomeChar!(ElementType!R) || if (isRandomAccessRange!R && hasSlicing!R && hasLength!R && isSomeChar!(ElementType!R) &&
isNarrowString!R) && !isSomeString!R && isSomeChar!C)
!isConvertibleToString!R && {
isSomeChar!C) return _withDefaultExtension(path, ext);
}
/// Ditto
auto withDefaultExtension(C1, C2)(C1[] path, C2[] ext)
if (isSomeChar!C1 && isSomeChar!C2)
{
return _withDefaultExtension(path, ext);
}
private auto _withDefaultExtension(R, C)(R path, C[] ext)
{ {
import std.range : only, chain; import std.range : only, chain;
import std.utf : byUTF; import std.utf : byUTF;
alias CR = Unqual!(ElementEncodingType!R); alias CR = Unqual!(ElementEncodingType!R);
auto dot = only(CR('.')); auto dot = only(CR('.'));
auto i = extSeparatorPos(path); immutable i = extSeparatorPos(path);
if (i == -1) if (i == -1)
{ {
if (ext.length > 0 && ext[0] == '.') if (ext.length > 0 && ext[0] == '.')
@ -1372,15 +1382,17 @@ if ((isRandomAccessRange!R && hasSlicing!R && hasLength!R && isSomeChar!(Element
assert(withDefaultExtension("file".byChar, "").array == "file."); assert(withDefaultExtension("file".byChar, "").array == "file.");
} }
auto withDefaultExtension(R, C)(auto ref R path, C[] ext)
if (isConvertibleToString!R)
{
return withDefaultExtension!(StringTypeOf!R, C)(path, ext);
}
@safe unittest @safe unittest
{ {
import std.algorithm.comparison : equal;
assert(testAliasedString!withDefaultExtension("file", "ext")); assert(testAliasedString!withDefaultExtension("file", "ext"));
enum S : string { a = "foo" }
assert(equal(S.a.withDefaultExtension(".txt"), "foo.txt"));
char[S.a.length] sa = S.a[];
assert(equal(sa.withDefaultExtension(".txt"), "foo.txt"));
} }
/** Combines one or more path segments. /** Combines one or more path segments.