diff --git a/source/dub/dependency.d b/source/dub/dependency.d index c02a5d8..a00a6da 100644 --- a/source/dub/dependency.d +++ b/source/dub/dependency.d @@ -133,7 +133,7 @@ @property bool isExactVersion() const { return m_versA == m_versB; } @property Version version_() const { - enforce(m_versA == m_versB, "Dependency "~versionString()~" is no exact version."); + enforce(m_versA == m_versB, "Dependency "~versionString~" is no exact version."); return m_versA; } @@ -176,10 +176,10 @@ Json toJson() const { Json json; if( path.empty && !optional ){ - json = Json(versionString()); + json = Json(this.versionString); } else { json = Json.emptyObject; - json["version"] = versionString(); + json["version"] = this.versionString; if (!path.empty) json["path"] = path.toString(); if (optional) json["optional"] = true; } @@ -202,7 +202,7 @@ logDiagnostic("Ignoring version specification (%s) for path based dependency %s", pv.get!string, pp.get!string); dep = Dependency.ANY; - dep.path = Path(verspec.path.get!string()); + dep.path = Path(verspec.path.get!string); } else { enforce("version" in verspec, "No version field specified!"); auto ver = verspec["version"].get!string; @@ -210,11 +210,11 @@ dep = Dependency(ver); } if( auto po = "optional" in verspec ) { - dep.optional = verspec.optional.get!bool(); + dep.optional = verspec.optional.get!bool; } } else { // canonical "package-id": "version" - dep = Dependency(verspec.get!string()); + dep = Dependency(verspec.get!string); } return dep; } @@ -347,28 +347,28 @@ a = Dependency("<=1.0.0 >=2.0.0"); assert (!a.valid(), a.toString()); - a = Dependency(">=1.0.0 <=5.0.0"), b = Dependency(">=2.0.0"); + a = Dependency(">=1.0.0 <=5.0.0"); b = Dependency(">=2.0.0"); assert (a.merge(b).valid() && a.merge(b).versionString == ">=2.0.0 <=5.0.0", a.merge(b).toString()); assertThrown(a = Dependency(">1.0.0 ==5.0.0"), "Construction is invalid"); - a = Dependency(">1.0.0"), b = Dependency("<2.0.0"); + a = Dependency(">1.0.0"); b = Dependency("<2.0.0"); assert (a.merge(b).valid(), a.merge(b).toString()); assert (a.merge(b).versionString == ">1.0.0 <2.0.0", a.merge(b).toString()); - a = Dependency(">2.0.0"), b = Dependency("<1.0.0"); + a = Dependency(">2.0.0"); b = Dependency("<1.0.0"); assert (!(a.merge(b)).valid(), a.merge(b).toString()); - a = Dependency(">=2.0.0"), b = Dependency("<=1.0.0"); + a = Dependency(">=2.0.0"); b = Dependency("<=1.0.0"); assert (!(a.merge(b)).valid(), a.merge(b).toString()); - a = Dependency("==2.0.0"), b = Dependency("==1.0.0"); + a = Dependency("==2.0.0"); b = Dependency("==1.0.0"); assert (!(a.merge(b)).valid(), a.merge(b).toString()); - a = Dependency("1.0.0"), b = Dependency("==1.0.0"); + a = Dependency("1.0.0"); b = Dependency("==1.0.0"); assert (a == b); - a = Dependency("<=2.0.0"), b = Dependency("==1.0.0"); + a = Dependency("<=2.0.0"); b = Dependency("==1.0.0"); Dependency m = a.merge(b); assert (m.valid(), m.toString()); assert (m.matches(Version("1.0.0"))); diff --git a/source/dub/dub.d b/source/dub/dub.d index bb78e5f..da578c2 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -436,7 +436,7 @@ /// Returns all cached packages as a "packageId" = "version" associative array - string[string] cachedPackages() const { return m_project.cachedPackagesIDs(); } + string[string] cachedPackages() const { return m_project.cachedPackagesIDs; } /// Fetches the package matching the dependency and places it in the specified location. Package fetch(string packageId, const Dependency dep, PlacementLocation location, FetchOptions options, string reason = "") @@ -449,7 +449,7 @@ supplier = ps; break; } catch(Exception e) { - logDiagnostic("Package %s not found for %s: %s", packageId, ps.description(), e.msg); + logDiagnostic("Package %s not found for %s: %s", packageId, ps.description, e.msg); logDebug("Full error: %s", e.toString().sanitize()); } } @@ -605,7 +605,7 @@ void createEmptyPackage(Path path, string[] deps, string type) { - if( !path.absolute() ) path = m_rootPath ~ path; + if (!path.absolute) path = m_rootPath ~ path; path.normalize(); if (m_dryRun) return; diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index dc4b429..2608f15 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -121,10 +121,10 @@ ret.put("EndGlobal\n"); // Writing solution file - logDebug("About to write to .sln file with %s bytes", to!string(ret.data().length)); + logDebug("About to write to .sln file with %s bytes", to!string(ret.data.length)); auto sln = openFile(solutionFileName(), FileMode.CreateTrunc); scope(exit) sln.close(); - sln.put(ret.data()); + sln.put(ret.data); sln.flush(); } @@ -227,10 +227,10 @@ ret.put("\n "); ret.put("\n \n"); - logDebug("About to write to '%s.visualdproj' file %s bytes", getPackageFileName(packname), ret.data().length); + logDebug("About to write to '%s.visualdproj' file %s bytes", getPackageFileName(packname), ret.data.length); auto proj = openFile(projFileName(packname), FileMode.CreateTrunc); scope(exit) proj.close(); - proj.put(ret.data()); + proj.put(ret.data); proj.flush(); } @@ -454,8 +454,8 @@ int opCmp(ref const SourceFile rhs) const { return sortOrder(this, rhs); } // "a < b" for folder structures (deepest folder first, else lexical) private final static int sortOrder(ref const SourceFile a, ref const SourceFile b) { - assert(!a.structurePath.empty()); - assert(!b.structurePath.empty()); + assert(!a.structurePath.empty); + assert(!b.structurePath.empty); auto as = a.structurePath; auto bs = b.structurePath; diff --git a/source/dub/init.d b/source/dub/init.d index 1e9bd83..40a5cd7 100644 --- a/source/dub/init.d +++ b/source/dub/init.d @@ -111,7 +111,7 @@ version (Windows) username = environment.get("USERNAME", "Peter Parker"); else username = environment.get("USER", "Peter Parker"); - auto fil = openFile(root_path ~ defaultPackageFilename(), FileMode.Append); + auto fil = openFile(root_path ~ defaultPackageFilename, FileMode.Append); scope(exit) fil.close(); fil.formattedWrite("{\n\t\"name\": \"%s\",\n", root_path.head.toString().toLower()); diff --git a/source/dub/internal/vibecompat/core/file.d b/source/dub/internal/vibecompat/core/file.d index 0e004dd..0f6d1ec 100644 --- a/source/dub/internal/vibecompat/core/file.d +++ b/source/dub/internal/vibecompat/core/file.d @@ -64,7 +64,7 @@ case FileMode.Append: fmode = std.stream.FileMode.Append; break; } auto ret = new std.stream.File(path.toNativeString(), fmode); - assert(ret.isOpen()); + assert(ret.isOpen); return RangeFile(ret); } /// ditto diff --git a/source/dub/internal/vibecompat/core/log.d b/source/dub/internal/vibecompat/core/log.d index 9bce901..5d0c705 100644 --- a/source/dub/internal/vibecompat/core/log.d +++ b/source/dub/internal/vibecompat/core/log.d @@ -73,10 +73,10 @@ if( level >= s_minLevel ){ if (level == LogLevel.info) { - stdout.writeln(txt.data()); + stdout.writeln(txt.data); stdout.flush(); } else { - stderr.writeln(txt.data()); + stderr.writeln(txt.data); stderr.flush(); } } diff --git a/source/dub/package_.d b/source/dub/package_.d index 9c23902..61aab6c 100644 --- a/source/dub/package_.d +++ b/source/dub/package_.d @@ -240,7 +240,7 @@ void storeInfo() { enforce(!ver.isUnknown, "Trying to store a package with an 'unknown' version, this is not supported."); - auto filename = m_path ~ defaultPackageFilename(); + auto filename = m_path ~ defaultPackageFilename; auto dstFile = openFile(filename.toNativeString(), FileMode.CreateTrunc); scope(exit) dstFile.close(); dstFile.writePrettyJsonString(m_info.toJson()); @@ -467,7 +467,7 @@ logWarn("License in subpackage %s is different than it's parent package, this is discouraged.", name); } } - if (name.empty()) logWarn("The package in %s has no name.", path); + if (name.empty) logWarn("The package in %s has no name.", path); } private static RawPackage rawPackageFromFile(PathAndFormat file, bool silent_fail = false) { diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index 41e0532..2f36ddd 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -287,8 +287,8 @@ /// destination and sets a version field in the package description. Package storeFetchedPackage(Path zip_file_path, Json package_info, Path destination) { - auto package_name = package_info.name.get!string(); - auto package_version = package_info["version"].get!string(); + auto package_name = package_info.name.get!string; + auto package_version = package_info["version"].get!string; auto clean_package_version = package_version[package_version.startsWith("~") ? 1 : 0 .. $]; logDiagnostic("Placing package '%s' version '%s' to location '%s' from file '%s'", @@ -358,11 +358,11 @@ // overwrite dub.json (this one includes a version field) auto pack = new Package(destination, PathAndFormat(), null, package_info["version"].get!string); - if (pack.packageInfoFilename.head != defaultPackageFilename()) { + if (pack.packageInfoFilename.head != defaultPackageFilename) { // Storeinfo saved a default file, this could be different to the file from the zip. removeFile(pack.packageInfoFilename); journal.remove(Journal.Entry(Journal.Type.RegularFile, Path(pack.packageInfoFilename.head))); - journal.add(Journal.Entry(Journal.Type.RegularFile, Path(defaultPackageFilename()))); + journal.add(Journal.Entry(Journal.Type.RegularFile, Path(defaultPackageFilename))); } pack.storeInfo(); @@ -414,7 +414,7 @@ auto fpath = p ~ fi.name; if (fi.isDirectory) { // Indicate a directory. - fpath.endsWithSlash(true); + fpath.endsWithSlash = true; // Ignore /.dub folder: This folder and its content // are not tracked by the Journal. if (fpath.relativeTo(pack.path) == Path(".dub/")) @@ -538,12 +538,12 @@ enforce(packlist.type == Json.Type.array, LocalPackagesFilename~" must contain an array."); foreach( pentry; packlist ){ try { - auto name = pentry.name.get!string(); - auto path = Path(pentry.path.get!string()); + auto name = pentry.name.get!string; + auto path = Path(pentry.path.get!string); if (name == "*") { paths ~= path; } else { - auto ver = Version(pentry["version"].get!string()); + auto ver = Version(pentry["version"].get!string); Package pp; if (!refresh_existing_packages) { diff --git a/source/dub/project.d b/source/dub/project.d index ee2cc78..2afcdd2 100644 --- a/source/dub/project.d +++ b/source/dub/project.d @@ -936,7 +936,7 @@ if (j.type == Json.Type.string) return Dependency(Version(j.get!string)); else if (j.type == Json.Type.object) - return Dependency(Path(j.path.get!string())); + return Dependency(Path(j.path.get!string)); else throw new Exception(format("Unexpected type for dependency: %s", j.type)); } diff --git a/source/dub/recipe/json.d b/source/dub/recipe/json.d index 1e5e013..ccf2a59 100644 --- a/source/dub/recipe/json.d +++ b/source/dub/recipe/json.d @@ -133,7 +133,7 @@ switch (name) { default: break; case "name": - config.name = value.get!string(); + config.name = value.get!string; enforce(!config.name.empty, "Configurations must have a non-empty name."); break; case "platforms": config.platforms = deserializeJson!(string[])(value); break; @@ -160,7 +160,7 @@ { auto idx = std.string.indexOf(name, "-"); string basename, suffix; - if( idx >= 0 ) basename = name[0 .. idx], suffix = name[idx .. $]; + if( idx >= 0 ) { basename = name[0 .. idx]; suffix = name[idx .. $]; } else basename = name; switch(basename){ default: break; @@ -179,7 +179,7 @@ break; case "targetType": enforce(suffix.empty, "targetType does not support platform customization."); - bs.targetType = value.get!string().to!TargetType(); + bs.targetType = value.get!string.to!TargetType; break; case "targetPath": enforce(suffix.empty, "targetPath does not support platform customization."); @@ -207,7 +207,7 @@ case "files": case "sourceFiles": bs.sourceFiles[suffix] = deserializeJson!(string[])(value); break; case "sourcePaths": bs.sourcePaths[suffix] = deserializeJson!(string[])(value); break; - case "sourcePath": bs.sourcePaths[suffix] ~= [value.get!string()]; break; // deprecated + case "sourcePath": bs.sourcePaths[suffix] ~= [value.get!string]; break; // deprecated case "excludedSourceFiles": bs.excludedSourceFiles[suffix] = deserializeJson!(string[])(value); break; case "copyFiles": bs.copyFiles[suffix] = deserializeJson!(string[])(value); break; case "versions": bs.versions[suffix] = deserializeJson!(string[])(value); break;