diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index 115341f..4af15d4 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -353,7 +353,8 @@ static string pathToObjName(string path) { - return std.path.stripDrive(std.path.buildNormalizedPath(getcwd(), path~objSuffix))[1..$].replace(std.path.dirSeparator, "."); + import std.path : buildNormalizedPath, dirSeparator, stripDrive; + return stripDrive(buildNormalizedPath(getcwd(), path~objSuffix))[1..$].replace(dirSeparator, "."); } /// Compile a single source file (srcFile), and write the object to objName. diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index ff03744..4d5caa5 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -374,7 +374,7 @@ bool removeFrom(Package[] packs, in Package pack) { auto packPos = countUntil!("a.path == b.path")(packs, pack); if(packPos != -1) { - packs = std.algorithm.remove(packs, packPos); + packs = .remove(packs, packPos); return true; } return false; diff --git a/source/dub/recipe/json.d b/source/dub/recipe/json.d index c7730c3..2ffe0a9 100644 --- a/source/dub/recipe/json.d +++ b/source/dub/recipe/json.d @@ -17,7 +17,7 @@ import std.conv : to; import std.exception : enforce; import std.range; -import std.string : format; +import std.string : format, indexOf; import std.traits : EnumMembers; @@ -158,7 +158,7 @@ { foreach(string name, value; json) { - auto idx = std.string.indexOf(name, "-"); + auto idx = indexOf(name, "-"); string basename, suffix; if( idx >= 0 ) { basename = name[0 .. idx]; suffix = name[idx .. $]; } else basename = name;