diff --git a/source/dub/commandline.d b/source/dub/commandline.d index 140dbef..3b761de 100644 --- a/source/dub/commandline.d +++ b/source/dub/commandline.d @@ -899,7 +899,7 @@ fmt = rawfmt.to!PackageFormat; break; } catch (Exception) { - logError("Invalid format, \""~rawfmt~"\", enter either \"sdl\" or \"json\"."); + logError(`Invalid format '%s', enter either 'sdl' or 'json'.`, rawfmt); } } auto author = p.authors.join(", "); @@ -909,7 +909,7 @@ auto nameRegex = regex(`^[a-z0-9\-_]+$`); string triedName = input("Name", p.name); if (triedName.matchFirst(nameRegex).empty) { - logError("Invalid name, \""~triedName~"\", names should consist only of lowercase alphanumeric characters, - and _."); + logError(`Invalid name '%s', names should consist only of lowercase alphanumeric characters, dashes ('-') and underscores ('_').`, triedName); } else { p.name = triedName; break; diff --git a/source/dub/internal/utils.d b/source/dub/internal/utils.d index 345385b..c53d708 100644 --- a/source/dub/internal/utils.d +++ b/source/dub/internal/utils.d @@ -683,6 +683,6 @@ string getModuleNameFromFile(string filePath) { string fileContent = filePath.readText; - logDiagnostic("Get module name from path: " ~ filePath); + logDiagnostic("Get module name from path: %s", filePath); return getModuleNameFromContent(fileContent); } diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index cb637bd..31990f7 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -585,7 +585,7 @@ logDebug("About to delete root folder for package '%s'.", pack.path); rmdirRecurse(pack.path.toNativeString()); - logInfo("Removed package: '"~pack.name~"'"); + logInfo("Removed package: '%s'", pack.name); } /// Compatibility overload. Use the version without a `force_remove` argument instead. diff --git a/source/dub/packagesuppliers/filesystem.d b/source/dub/packagesuppliers/filesystem.d index 9cfb55e..fa752bd 100644 --- a/source/dub/packagesuppliers/filesystem.d +++ b/source/dub/packagesuppliers/filesystem.d @@ -42,7 +42,7 @@ { import dub.internal.vibecompat.core.file : copyFile, existsFile; enforce(path.absolute); - logInfo("Storing package '"~packageId~"', version requirements: %s", dep); + logInfo("Storing package '%s', version requirements: %s", packageId, dep); auto filename = bestPackageFile(packageId, dep, pre_release); enforce(existsFile(filename)); copyFile(filename, path);