all: Simplify some method calls (#7499)

strings.Replace(a, b, c, -1) -> strings.ReplaceAll(a, b, c)

(Go 1.12) and who knows what was up with that dialQueue.Sort() thing.
This commit is contained in:
Jakob Borg
2021-03-17 23:12:26 +01:00
committed by GitHub
parent 960e850a78
commit 8ef504f745
10 changed files with 18 additions and 19 deletions
+2 -2
View File
@@ -115,7 +115,7 @@ func expandLocations() error {
newLocations := make(map[LocationEnum]string)
for key, dir := range locationTemplates {
for varName, value := range baseDirs {
dir = strings.Replace(dir, "${"+string(varName)+"}", value, -1)
dir = strings.ReplaceAll(dir, "${"+string(varName)+"}", value)
}
var err error
dir, err = fs.ExpandTilde(dir)
@@ -197,5 +197,5 @@ func GetTimestamped(key LocationEnum) string {
// 2006 replaced by 2015...
tpl := locations[key]
now := time.Now().Format("20060102-150405")
return strings.Replace(tpl, "${timestamp}", now, -1)
return strings.ReplaceAll(tpl, "${timestamp}", now)
}