Move foreign code from global scope to dub.internal.

Avoids conflicting with the actual dub packages when working with dub as a library. Also, even if just by convention, it ensures that dependent code doesn't rely on this code as a public API.
dlang · Nov 2, 2022 · fd04494 · fd04494
1 parent 451b7d5
commit fd04494
Show file tree

Hide file tree

Showing 43 changed files with 225 additions and 225 deletions.
diff --git a/build-files.txt b/build-files.txt
@@ -1,9 +1,4 @@
 source/app.d
-source/configy/Attributes.d
-source/configy/Exceptions.d
-source/configy/FieldRef.d
-source/configy/Read.d
-source/configy/Utils.d
 source/dub/commandline.d
 source/dub/compilers/buildsettings.d
 source/dub/compilers/compiler.d
@@ -22,6 +17,34 @@ source/dub/generators/sublimetext.d
 source/dub/generators/targetdescription.d
 source/dub/generators/visuald.d
 source/dub/init.d
+source/dub/internal/configy/Attributes.d
+source/dub/internal/configy/Exceptions.d
+source/dub/internal/configy/FieldRef.d
+source/dub/internal/configy/Read.d
+source/dub/internal/configy/Utils.d
+source/dub/internal/dyaml/composer.d
+source/dub/internal/dyaml/constructor.d
+source/dub/internal/dyaml/dumper.d
+source/dub/internal/dyaml/emitter.d
+source/dub/internal/dyaml/encoding.d
+source/dub/internal/dyaml/escapes.d
+source/dub/internal/dyaml/event.d
+source/dub/internal/dyaml/exception.d
+source/dub/internal/dyaml/linebreak.d
+source/dub/internal/dyaml/loader.d
+source/dub/internal/dyaml/node.d
+source/dub/internal/dyaml/package.d
+source/dub/internal/dyaml/parser.d
+source/dub/internal/dyaml/queue.d
+source/dub/internal/dyaml/reader.d
+source/dub/internal/dyaml/representer.d
+source/dub/internal/dyaml/resolver.d
+source/dub/internal/dyaml/scanner.d
+source/dub/internal/dyaml/serializer.d
+source/dub/internal/dyaml/stdsumtype.d
+source/dub/internal/dyaml/style.d
+source/dub/internal/dyaml/tagdirective.d
+source/dub/internal/dyaml/token.d
 source/dub/internal/git.d
 source/dub/internal/libInputVisitor.d
 source/dub/internal/sdlang/ast.d
@@ -32,6 +55,7 @@ source/dub/internal/sdlang/parser.d
 source/dub/internal/sdlang/symbol.d
 source/dub/internal/sdlang/token.d
 source/dub/internal/sdlang/util.d
+source/dub/internal/tinyendian.d
 source/dub/internal/undead/xml.d
 source/dub/internal/utils.d
 source/dub/internal/vibecompat/core/file.d
@@ -63,27 +87,3 @@ source/dub/recipe/selection.d
 source/dub/recipe/sdl.d
 source/dub/semver.d
 source/dub/version_.d
-source/dyaml/composer.d
-source/dyaml/constructor.d
-source/dyaml/dumper.d
-source/dyaml/emitter.d
-source/dyaml/encoding.d
-source/dyaml/escapes.d
-source/dyaml/event.d
-source/dyaml/exception.d
-source/dyaml/linebreak.d
-source/dyaml/loader.d
-source/dyaml/node.d
-source/dyaml/package.d
-source/dyaml/parser.d
-source/dyaml/queue.d
-source/dyaml/reader.d
-source/dyaml/representer.d
-source/dyaml/resolver.d
-source/dyaml/scanner.d
-source/dyaml/serializer.d
-source/dyaml/stdsumtype.d
-source/dyaml/style.d
-source/dyaml/tagdirective.d
-source/dyaml/token.d
-source/tinyendian.d
diff --git a/source/dub/commandline.d b/source/dub/commandline.d
@@ -21,7 +21,7 @@ import dub.packagesuppliers;
 import dub.project;
 import dub.internal.utils : getDUBVersion, getClosestMatch, getTempFile;
 
-import dyaml.stdsumtype;
+import dub.internal.dyaml.stdsumtype;
 
 import std.algorithm;
 import std.array;

diff --git a/source/dub/compilers/buildsettings.d b/source/dub/compilers/buildsettings.d
@@ -9,7 +9,7 @@ module dub.compilers.buildsettings;
 
 import dub.internal.vibecompat.inet.path;
 
-import configy.Attributes;
+import dub.internal.configy.Attributes;
 
 import std.array : array;
 import std.algorithm : filter, any;
@@ -425,7 +425,7 @@ struct Flags (T) {
 	 */
 	public static Flags!T fromYAML (scope ConfigParser!(Flags!T) p)
 	{
-		import dyaml.node;
+		import dub.internal.dyaml.node;
 		import std.exception;
 		import std.conv;
 
@@ -439,7 +439,7 @@ struct Flags (T) {
 
 unittest
 {
-	import configy.Read;
+	import dub.internal.configy.Read;
 
 	static struct Config
 	{

diff --git a/source/dub/dependency.d b/source/dub/dependency.d
@@ -15,7 +15,7 @@ import dub.package_;
 import dub.semver;
 import dub.internal.logging;
 
-import dyaml.stdsumtype;
+import dub.internal.dyaml.stdsumtype;
 
 import std.algorithm;
 import std.array;

diff --git a/source/dub/dub.d b/source/dub/dub.d
@@ -221,7 +221,7 @@ class Dub {
 	 */
 	protected void loadConfig()
 	{
-		import configy.Read;
+		import dub.internal.configy.Read;
 
 		void readSettingsFile (NativePath path_)
 		{
@@ -1864,7 +1864,7 @@ private struct SpecialDirs {
  * non-additive are marked as `SetInfo`.
  */
 private struct UserConfiguration {
-	import configy.Attributes;
+	import dub.internal.configy.Attributes : Optional, SetInfo;
 
 	@Optional string[] registryUrls;
 	@Optional NativePath[] customCachePaths;
@@ -1916,7 +1916,7 @@ private struct UserConfiguration {
 }
 
 unittest {
-	import configy.Read;
+	import dub.internal.configy.Read;
 
     const str1 = `{
   "registryUrls": [ "http://foo.bar\/optional\/escape" ],

diff --git a/source/configy/Attributes.d → source/dub/internal/configy/Attributes.d b/source/configy/Attributes.d → source/dub/internal/configy/Attributes.d
@@ -14,7 +14,7 @@
 
 *******************************************************************************/
 
-module configy.Attributes;
+module dub.internal.configy.Attributes;
 
 import std.traits;
 
@@ -291,9 +291,9 @@ public auto converter (FT) (FT func)
 
 public interface ConfigParser (T)
 {
-    import dyaml.node;
-    import configy.FieldRef : StructFieldRef;
-    import configy.Read : Context, parseField;
+    import dub.internal.dyaml.node;
+    import dub.internal.configy.FieldRef : StructFieldRef;
+    import dub.internal.configy.Read : Context, parseField;
 
     /// Returns: the node being processed
     public inout(Node) node () inout @safe pure nothrow @nogc;

diff --git a/source/configy/DubTest.d → source/dub/internal/configy/DubTest.d b/source/configy/DubTest.d → source/dub/internal/configy/DubTest.d
@@ -12,12 +12,12 @@
 
 *******************************************************************************/
 
-module configy.DubTest;
+module dub.internal.configy.DubTest;
 
-import configy.Attributes;
-import configy.Read;
+import dub.internal.configy.Attributes;
+import dub.internal.configy.Read;
 
-import dyaml.node;
+import dub.internal.dyaml.node;
 
 /// Test name pattern matching
 unittest

diff --git a/source/configy/Exceptions.d → source/dub/internal/configy/Exceptions.d b/source/configy/Exceptions.d → source/dub/internal/configy/Exceptions.d
@@ -11,12 +11,12 @@
 
 *******************************************************************************/
 
-module configy.Exceptions;
+module dub.internal.configy.Exceptions;
 
-import configy.Utils;
+import dub.internal.configy.Utils;
 
-import dyaml.exception;
-import dyaml.node;
+import dub.internal.dyaml.exception;
+import dub.internal.dyaml.node;
 
 import std.algorithm : filter, map;
 import std.format;

diff --git a/source/configy/FieldRef.d → source/dub/internal/configy/FieldRef.d b/source/configy/FieldRef.d → source/dub/internal/configy/FieldRef.d
@@ -15,10 +15,10 @@
 
 *******************************************************************************/
 
-module configy.FieldRef;
+module dub.internal.configy.FieldRef;
 
 // Renamed imports as the names exposed by `FieldRef` shadow the imported ones.
-import configy.Attributes : CAName = Name, CAOptional = Optional, SetInfo;
+import dub.internal.configy.Attributes : CAName = Name, CAOptional = Optional, SetInfo;
 
 import std.meta;
 import std.traits;
@@ -82,7 +82,7 @@ package template FieldRef (alias T, string name, bool forceOptional = false)
 
 unittest
 {
-    import configy.Attributes : Name;
+    import dub.internal.configy.Attributes : Name;
 
     static struct Config1
     {

diff --git a/source/configy/Read.d → source/dub/internal/configy/Read.d b/source/configy/Read.d → source/dub/internal/configy/Read.d
@@ -138,17 +138,17 @@
 
 *******************************************************************************/
 
-module configy.Read;
+module dub.internal.configy.Read;
 
-public import configy.Attributes;
-public import configy.Exceptions : ConfigException;
-import configy.Exceptions;
-import configy.FieldRef;
-import configy.Utils;
+public import dub.internal.configy.Attributes;
+public import dub.internal.configy.Exceptions : ConfigException;
+import dub.internal.configy.Exceptions;
+import dub.internal.configy.FieldRef;
+import dub.internal.configy.Utils;
 
-import dyaml.exception;
-import dyaml.node;
-import dyaml.loader;
+import dub.internal.dyaml.exception;
+import dub.internal.dyaml.node;
+import dub.internal.dyaml.loader;
 
 import std.algorithm;
 import std.conv;

diff --git a/source/configy/Test.d → source/dub/internal/configy/Test.d b/source/configy/Test.d → source/dub/internal/configy/Test.d
@@ -10,14 +10,14 @@
 
 *******************************************************************************/
 
-module configy.Test;
+module dub.internal.configy.Test;
 
-import configy.Attributes;
-import configy.Exceptions;
-import configy.Read;
-import configy.Utils;
+import dub.internal.configy.Attributes;
+import dub.internal.configy.Exceptions;
+import dub.internal.configy.Read;
+import dub.internal.configy.Utils;
 
-import dyaml.node;
+import dub.internal.dyaml.node;
 
 import std.format;
 

diff --git a/source/configy/Utils.d → source/dub/internal/configy/Utils.d b/source/configy/Utils.d → source/dub/internal/configy/Utils.d
@@ -15,7 +15,7 @@
 
 *******************************************************************************/
 
-module configy.Utils;
+module dub.internal.configy.Utils;
 
 import std.format;
 

diff --git a/source/dyaml/composer.d → source/dub/internal/dyaml/composer.d b/source/dyaml/composer.d → source/dub/internal/dyaml/composer.d
@@ -8,7 +8,7 @@
  * Composes nodes from YAML events provided by parser.
  * Code based on PyYAML: http://www.pyyaml.org
  */
-module dyaml.composer;
+module dub.internal.dyaml.composer;
 
 import core.memory;
 
@@ -20,12 +20,12 @@ import std.format;
 import std.range;
 import std.typecons;
 
-import dyaml.constructor;
-import dyaml.event;
-import dyaml.exception;
-import dyaml.node;
-import dyaml.parser;
-import dyaml.resolver;
+import dub.internal.dyaml.constructor;
+import dub.internal.dyaml.event;
+import dub.internal.dyaml.exception;
+import dub.internal.dyaml.node;
+import dub.internal.dyaml.parser;
+import dub.internal.dyaml.resolver;
 
 
 package:
@@ -385,7 +385,7 @@ struct Composer
 // DUB: This unittest is `@safe` from v2.100 as `message` was made `@safe`, not before
 unittest
 {
-    import dyaml.loader : Loader;
+    import dub.internal.dyaml.loader : Loader;
 
     const str = `{
     "comment": "This is a common technique",

diff --git a/source/dyaml/constructor.d → source/dub/internal/dyaml/constructor.d b/source/dyaml/constructor.d → source/dub/internal/dyaml/constructor.d
@@ -9,7 +9,7 @@
  * This can be used to add custom data types. A tutorial can be found
  * $(LINK2 https://dlang-community.github.io/D-YAML/, here).
  */
-module dyaml.constructor;
+module dub.internal.dyaml.constructor;
 
 
 import std.array;
@@ -24,9 +24,9 @@ import std.string;
 import std.typecons;
 import std.utf;
 
-import dyaml.node;
-import dyaml.exception;
-import dyaml.style;
+import dub.internal.dyaml.node;
+import dub.internal.dyaml.exception;
+import dub.internal.dyaml.style;
 
 package:
 

diff --git a/source/dyaml/dumper.d → source/dub/internal/dyaml/dumper.d b/source/dyaml/dumper.d → source/dub/internal/dyaml/dumper.d
@@ -9,22 +9,22 @@
  *
  * Code based on $(LINK2 http://www.pyyaml.org, PyYAML).
  */
-module dyaml.dumper;
+module dub.internal.dyaml.dumper;
 
 import std.array;
 import std.range.primitives;
 import std.typecons;
 
-import dyaml.emitter;
-import dyaml.event;
-import dyaml.exception;
-import dyaml.linebreak;
-import dyaml.node;
-import dyaml.representer;
-import dyaml.resolver;
-import dyaml.serializer;
-import dyaml.style;
-import dyaml.tagdirective;
+import dub.internal.dyaml.emitter;
+import dub.internal.dyaml.event;
+import dub.internal.dyaml.exception;
+import dub.internal.dyaml.linebreak;
+import dub.internal.dyaml.node;
+import dub.internal.dyaml.representer;
+import dub.internal.dyaml.resolver;
+import dub.internal.dyaml.serializer;
+import dub.internal.dyaml.style;
+import dub.internal.dyaml.tagdirective;
 
 
 /**