diff --git a/source/dub/commandline.d b/source/dub/commandline.d index aab0418..4be40b5 100644 --- a/source/dub/commandline.d +++ b/source/dub/commandline.d @@ -21,6 +21,8 @@ import dub.project; import dub.internal.utils : getDUBVersion, getClosestMatch, getTempFile; +import dyaml.stdsumtype; + import std.algorithm; import std.array; import std.conv; @@ -32,7 +34,6 @@ import std.process; import std.stdio; import std.string; -import std.sumtype; import std.typecons : Tuple, tuple; import std.variant; import std.path: setExtension; diff --git a/source/dub/dependency.d b/source/dub/dependency.d index 8817d5e..e92974d 100644 --- a/source/dub/dependency.d +++ b/source/dub/dependency.d @@ -15,11 +15,12 @@ import dub.semver; import dub.internal.logging; +import dyaml.stdsumtype; + import std.algorithm; import std.array; import std.exception; import std.string; -import std.sumtype; /** Encapsulates the name of a package along with its dependency specification. diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index fef7bc4..2f6c534 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -18,6 +18,8 @@ import configy.Exceptions; public import configy.Read : StrictMode; +import dyaml.stdsumtype; + import std.algorithm : countUntil, filter, map, sort, canFind, remove; import std.array; import std.conv; @@ -27,7 +29,6 @@ import std.file; import std.range; import std.string; -import std.sumtype; import std.zip; diff --git a/source/dub/recipe/packagerecipe.d b/source/dub/recipe/packagerecipe.d index deedc67..7037f06 100644 --- a/source/dub/recipe/packagerecipe.d +++ b/source/dub/recipe/packagerecipe.d @@ -703,7 +703,7 @@ private T clone(T)(ref const(T) val) { - import std.sumtype; + import dyaml.stdsumtype; import std.traits : isSomeString, isDynamicArray, isAssociativeArray, isBasicType, ValueType; static if (is(T == immutable)) return val;