Fixup.

dlang · Feb 22, 2017 · cbe25ea · cbe25ea
1 parent 64da9be
commit cbe25ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/source/dub/compilers/buildsettings.d b/source/dub/compilers/buildsettings.d
@@ -150,16 +150,13 @@ struct BuildSettings {
 	private void addSI(ref string[] arr, in string[] vals)
 	{
 		bool[string] existing;
-		foreach (v; arr) {
-			auto p = Path(v);
-			auto s = p.length > 0 ? p.head.toString() : null;
-			existing[s] = true;
-		}
+		foreach (v; arr) existing[Path(v).head.toString()] = true;
 		foreach (v; vals) {
-			auto p = Path(v);
-			auto s = p.length > 0 ? p.head.toString() : null;
-			if (s !in existing)
+			auto s = Path(v).head.toString();
+			if (s !in existing) {
+				existing[s] = true;
 				arr ~= v;
+			}
 		}
 	}
 

diff --git a/source/dub/recipe/packagerecipe.d b/source/dub/recipe/packagerecipe.d
@@ -175,7 +175,7 @@ struct BuildSettingsTemplate {
 
 		void collectFiles(string method)(in string[][string] paths_map, string pattern)
 		{
-			auto files = appender!string;
+			auto files = appender!(string[]);
 
 			foreach (suffix, paths; paths_map) {
 				if (!platform.matchesSpecification(suffix))