diff --git a/source/dub/generators/monod.d b/source/dub/generators/monod.d index a96996c..2bf3450 100644 --- a/source/dub/generators/monod.d +++ b/source/dub/generators/monod.d @@ -42,7 +42,7 @@ void generateProject(GeneratorSettings settings) { - logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, to!string(m_app.mainPackage().dependencies().length)); + logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, m_app.mainPackage().dependencies().length); generateProjects(m_app.mainPackage(), settings); generateSolution(settings); } diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 7f578ae..03ccc10 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -42,7 +42,7 @@ } void generateProject(GeneratorSettings settings) { - logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, to!string(m_app.mainPackage().dependencies().length)); + logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, m_app.mainPackage().dependencies().length); generateProjects(m_app.mainPackage(), settings); generateSolution(); } diff --git a/source/dub/installation.d b/source/dub/installation.d index af92ca9..74c8495 100644 --- a/source/dub/installation.d +++ b/source/dub/installation.d Binary files differ diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index 22b88c9..f3c1dc8 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -382,7 +382,7 @@ } packs[pdir.name] = vers; } - catch(Exception e) logDebug("Failed to enumerate %s packages: %s", to!string(location), e.toString()); + catch(Exception e) logDebug("Failed to enumerate %s packages: %s", location, e.toString()); } } scanPackageFolder(m_systemPackagePath, m_systemPackages, InstallLocation.SystemWide); diff --git a/source/dub/packagesupplier.d b/source/dub/packagesupplier.d index f72ada5..6c2eb03 100644 --- a/source/dub/packagesupplier.d +++ b/source/dub/packagesupplier.d @@ -50,7 +50,7 @@ private Path bestPackageFile( const string packageId, const Dependency dep) const { Version bestVersion = Version(Version.RELEASE); - foreach(DirEntry d; dirEntries(to!string(m_path), packageId~"*", SpanMode.shallow)) { + foreach(DirEntry d; dirEntries(m_path.toNativeString(), packageId~"*", SpanMode.shallow)) { Path p = Path(d.name); logTrace("Entry: %s", p); enforce(to!string(p.head)[$-4..$] == ".zip"); diff --git a/source/dub/project.d b/source/dub/project.d index e7a85ea..ce81b97 100644 --- a/source/dub/project.d +++ b/source/dub/project.d @@ -60,7 +60,7 @@ @property string info() const { if(!m_main) - return "-Unregocgnized application in '"~to!string(m_root)~"' (properly no package.json in this directory)"; + return "-Unregocgnized application in '"~m_root.toNativeString()~"' (properly no package.json in this directory)"; string s = "-Application identifier: " ~ m_main.name; s ~= "\n" ~ m_main.info(); s ~= "\n-Installed dependencies:"; diff --git a/source/dub/utils.d b/source/dub/utils.d index 61c30fd..78ac3b3 100644 --- a/source/dub/utils.d +++ b/source/dub/utils.d @@ -23,14 +23,14 @@ package bool isEmptyDir(Path p) { - foreach(DirEntry e; dirEntries(to!string(p), SpanMode.shallow)) + foreach(DirEntry e; dirEntries(p.toNativeString(), SpanMode.shallow)) return false; return true; } package Json jsonFromFile(Path file, bool silent_fail = false) { if( silent_fail && !existsFile(file) ) return Json.EmptyObject; - auto f = openFile(to!string(file), FileMode.Read); + auto f = openFile(file.toNativeString(), FileMode.Read); scope(exit) f.close(); auto text = stripUTF8Bom(cast(string)f.readAll()); return parseJson(text);