Merge pull request #704 from dolmen/replace-unneeded-Sprintf

Fix unnecessary uses of Sprintf
main
Jesse Szwedko 6 years ago committed by GitHub
commit 803d066579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -636,7 +636,7 @@ func withEnvHint(envVar, str string) string {
suffix = "%" suffix = "%"
sep = "%, %" sep = "%, %"
} }
envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(strings.Split(envVar, ","), sep), suffix) envText = " [" + prefix + strings.Join(strings.Split(envVar, ","), sep) + suffix + "]"
} }
return str + envText return str + envText
} }
@ -709,13 +709,13 @@ func stringifyFlag(f Flag) string {
placeholder = defaultPlaceholder placeholder = defaultPlaceholder
} }
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultValueString)) usageWithDefault := strings.TrimSpace(usage + defaultValueString)
return FlagFileHinter( return FlagFileHinter(
fv.FieldByName("FilePath").String(), fv.FieldByName("FilePath").String(),
FlagEnvHinter( FlagEnvHinter(
fv.FieldByName("EnvVar").String(), fv.FieldByName("EnvVar").String(),
fmt.Sprintf("%s\t%s", FlagNamePrefixer(fv.FieldByName("Name").String(), placeholder), usageWithDefault), FlagNamePrefixer(fv.FieldByName("Name").String(), placeholder)+"\t"+usageWithDefault,
), ),
) )
} }
@ -724,7 +724,7 @@ func stringifyIntSliceFlag(f IntSliceFlag) string {
defaultVals := []string{} defaultVals := []string{}
if f.Value != nil && len(f.Value.Value()) > 0 { if f.Value != nil && len(f.Value.Value()) > 0 {
for _, i := range f.Value.Value() { for _, i := range f.Value.Value() {
defaultVals = append(defaultVals, fmt.Sprintf("%d", i)) defaultVals = append(defaultVals, strconv.Itoa(i))
} }
} }
@ -735,7 +735,7 @@ func stringifyInt64SliceFlag(f Int64SliceFlag) string {
defaultVals := []string{} defaultVals := []string{}
if f.Value != nil && len(f.Value.Value()) > 0 { if f.Value != nil && len(f.Value.Value()) > 0 {
for _, i := range f.Value.Value() { for _, i := range f.Value.Value() {
defaultVals = append(defaultVals, fmt.Sprintf("%d", i)) defaultVals = append(defaultVals, strconv.FormatInt(i, 10))
} }
} }
@ -747,7 +747,7 @@ func stringifyStringSliceFlag(f StringSliceFlag) string {
if f.Value != nil && len(f.Value.Value()) > 0 { if f.Value != nil && len(f.Value.Value()) > 0 {
for _, s := range f.Value.Value() { for _, s := range f.Value.Value() {
if len(s) > 0 { if len(s) > 0 {
defaultVals = append(defaultVals, fmt.Sprintf("%q", s)) defaultVals = append(defaultVals, strconv.Quote(s))
} }
} }
} }
@ -766,8 +766,8 @@ func stringifySliceFlag(usage, name string, defaultVals []string) string {
defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", ")) defaultVal = fmt.Sprintf(" (default: %s)", strings.Join(defaultVals, ", "))
} }
usageWithDefault := strings.TrimSpace(fmt.Sprintf("%s%s", usage, defaultVal)) usageWithDefault := strings.TrimSpace(usage + defaultVal)
return fmt.Sprintf("%s\t%s", FlagNamePrefixer(name, placeholder), usageWithDefault) return FlagNamePrefixer(name, placeholder) + "\t" + usageWithDefault
} }
func flagFromFileEnv(filePath, envName string) (val string, ok bool) { func flagFromFileEnv(filePath, envName string) (val string, ok bool) {

Loading…
Cancel
Save