diff --git a/source/dub/dub.d b/source/dub/dub.d index adb0476..4bfba55 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -33,7 +33,7 @@ import std.string; import std.typecons; import std.zip; - +import std.encoding : sanitize; /// The default supplier for packages, which is the registry diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index b06f6ef..97f263b 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -24,7 +24,7 @@ import std.file; import std.process; import std.string; - +import std.encoding : sanitize; class BuildGenerator : ProjectGenerator { private { @@ -460,4 +460,4 @@ assert(!isLinkerFile("test.obj")); assert(!isLinkerFile("test.d")); } -} \ No newline at end of file +} diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d index d69bd34..87e6a31 100644 --- a/source/dub/generators/generator.d +++ b/source/dub/generators/generator.d @@ -17,7 +17,7 @@ import dub.packagemanager; import dub.project; -import std.algorithm : map; +import std.algorithm : map, filter, canFind; import std.array : array; import std.array; import std.exception; diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index 447a079..3c12c24 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -15,7 +15,7 @@ import dub.internal.vibecompat.inet.path; import dub.package_; -import std.algorithm : countUntil, filter, sort, canFind; +import std.algorithm : countUntil, filter, sort, canFind, remove; import std.array; import std.conv; import std.digest.sha; diff --git a/source/dub/packagesupplier.d b/source/dub/packagesupplier.d index 13e35de..7713f32 100644 --- a/source/dub/packagesupplier.d +++ b/source/dub/packagesupplier.d @@ -102,7 +102,7 @@ void retrievePackage(Path path, string packageId, Dependency dep, bool pre_release) { - import std.string : replace; + import std.array : replace; Json best = getBestPackage(packageId, dep, pre_release); auto vers = replace(best["version"].get!string, "+", "%2B"); auto url = m_registryUrl ~ Path(PackagesPath~"/"~packageId~"/"~vers~".zip"); diff --git a/source/dub/project.d b/source/dub/project.d index b98db22..0efc269 100644 --- a/source/dub/project.d +++ b/source/dub/project.d @@ -31,7 +31,7 @@ import std.string; import std.typecons; import std.zip; - +import std.encoding : sanitize; /// Representing a full project, with a root Package and several dependencies. class Project { diff --git a/source/dub/semver.d b/source/dub/semver.d index 8da46ca..48924ec 100644 --- a/source/dub/semver.d +++ b/source/dub/semver.d @@ -9,7 +9,7 @@ import std.range; import std.string; -import std.algorithm : join, split, max; +import std.algorithm : max; import std.conv; /*