Skip to content

Commit 3408302

Browse files
committed
clean up string builders
1 parent 13ad5a1 commit 3408302

File tree

18 files changed

+30
-56
lines changed

18 files changed

+30
-56
lines changed

modules/auth/password/password.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,23 @@ func NewComplexity() {
6161
}
6262

6363
func setupComplexity(values []string) {
64+
var validCharsSb strings.Builder
6465
if len(values) != 1 || values[0] != "off" {
65-
var validCharsSb strings.Builder
6666
for _, val := range values {
6767
if complexity, ok := charComplexities[val]; ok {
6868
validCharsSb.WriteString(complexity.ValidChars)
6969
requiredList = append(requiredList, complexity)
7070
}
7171
}
72-
validChars += validCharsSb.String()
7372
if len(requiredList) == 0 {
7473
// No valid character classes found; use all classes as default
75-
var validCharsSb strings.Builder
7674
for _, complexity := range charComplexities {
7775
validCharsSb.WriteString(complexity.ValidChars)
7876
requiredList = append(requiredList, complexity)
7977
}
80-
validChars += validCharsSb.String()
8178
}
8279
}
80+
validChars = validCharsSb.String()
8381
if validChars == "" {
8482
// No complexities to check; provide a sensible default for password generation
8583
validChars = charComplexities["lower"].ValidChars + charComplexities["upper"].ValidChars + charComplexities["digit"].ValidChars

modules/git/foreachref/format.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ func (f Format) Parser(r io.Reader) *Parser {
7575
// hexEscaped produces hex-escpaed characters from a string. For example, "\n\0"
7676
// would turn into "%0a%00".
7777
func (f Format) hexEscaped(delim []byte) string {
78-
escaped := ""
7978
var escapedSb strings.Builder
8079
for i := range delim {
8180
escapedSb.WriteString("%" + hex.EncodeToString([]byte{delim[i]}))
8281
}
83-
escaped += escapedSb.String()
84-
return escaped
82+
return escapedSb.String()
8583
}

modules/git/notes_nogogit.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
2626
return err
2727
}
2828

29-
path := ""
30-
3129
tree := &notes.Tree
3230
log.Trace("Found tree with ID %q while searching for git note corresponding to the commit %q", tree.ID, commitID)
3331

@@ -53,7 +51,7 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
5351
return err
5452
}
5553
}
56-
path += pathSb.String()
54+
path := pathSb.String()
5755

5856
blob := entry.Blob()
5957
dataRc, err := blob.DataAsync()

modules/setting/config.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ type OpenWithEditorApp struct {
2424
type OpenWithEditorAppsType []OpenWithEditorApp
2525

2626
func (t OpenWithEditorAppsType) ToTextareaString() string {
27-
ret := ""
2827
var retSb strings.Builder
2928
for _, app := range t {
3029
retSb.WriteString(app.DisplayName + " = " + app.OpenURL + "\n")
3130
}
32-
ret += retSb.String()
33-
return ret
31+
return retSb.String()
3432
}
3533

3634
func DefaultOpenWithEditorApps() OpenWithEditorAppsType {

modules/setting/config_env.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ func decodeEnvSectionKey(encoded string) (ok bool, section, key string) {
7777
}
7878
last = unescapeIdx[1]
7979
}
80-
key += keySb.String()
81-
section += sectionSb.String()
80+
key = keySb.String()
81+
section = sectionSb.String()
8282
remaining := encoded[last:]
8383
if !inKey {
8484
if splitter := strings.Index(remaining, "__"); splitter > -1 {

modules/templates/util_render.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ func (ut *RenderUtils) MarkdownToHtml(input string) template.HTML { //nolint:rev
249249
func (ut *RenderUtils) RenderLabels(labels []*issues_model.Label, repoLink string, issue *issues_model.Issue) template.HTML {
250250
isPullRequest := issue != nil && issue.IsPull
251251
baseLink := fmt.Sprintf("%s/%s", repoLink, util.Iif(isPullRequest, "pulls", "issues"))
252-
htmlCode := `<span class="labels-list">`
253252
var htmlCodeSb strings.Builder
253+
htmlCodeSb.WriteString(`<span class="labels-list">`)
254254
for _, label := range labels {
255255
// Protect against nil value in labels - shouldn't happen but would cause a panic if so
256256
if label == nil {
@@ -259,9 +259,8 @@ func (ut *RenderUtils) RenderLabels(labels []*issues_model.Label, repoLink strin
259259
link := fmt.Sprintf("%s?labels=%d", baseLink, label.ID)
260260
htmlCodeSb.WriteString(string(ut.RenderLabelWithLink(label, template.URL(link))))
261261
}
262-
htmlCode += htmlCodeSb.String()
263-
htmlCode += "</span>"
264-
return template.HTML(htmlCode)
262+
htmlCodeSb.WriteString("</span>")
263+
return template.HTML(htmlCodeSb.String())
265264
}
266265

267266
func (ut *RenderUtils) RenderThemeItem(info *webtheme.ThemeMetaInfo, iconSize int) template.HTML {

modules/timeutil/since.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
9595
return lang.TrString("tool.now")
9696
}
9797

98-
var timeStr, diffStr string
98+
var diffStr string
9999
var timeStrSb strings.Builder
100100
for {
101101
if diff == 0 {
@@ -105,6 +105,5 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
105105
diff, diffStr = computeTimeDiffFloor(diff, lang)
106106
timeStrSb.WriteString(", " + diffStr)
107107
}
108-
timeStr += timeStrSb.String()
109-
return strings.TrimPrefix(timeStr, ", ")
108+
return strings.TrimPrefix(timeStrSb.String(), ", ")
110109
}

routers/api/packages/rubygems/rubygems.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,17 +433,16 @@ func makePackageVersionDependency(ctx *context.Context, version *packages_model.
433433
}
434434

435435
func makePackageInfo(ctx *context.Context, versions []*packages_model.PackageVersion, c *cache.EphemeralCache) (string, error) {
436-
ret := "---\n"
437436
var retSb strings.Builder
437+
retSb.WriteString("---\n")
438438
for _, v := range versions {
439439
dep, err := makePackageVersionDependency(ctx, v, c)
440440
if err != nil {
441441
return "", err
442442
}
443443
retSb.WriteString(dep + "\n")
444444
}
445-
ret += retSb.String()
446-
return ret, nil
445+
return retSb.String(), nil
447446
}
448447

449448
func makeGemFullFileName(gemName, version, platform string) string {

routers/web/auth/oauth2_provider.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,11 @@ func AuthorizeOAuth(ctx *context.Context) {
179179
errs := binding.Errors{}
180180
errs = form.Validate(ctx.Req, errs)
181181
if len(errs) > 0 {
182-
errstring := ""
183182
var errstringSb strings.Builder
184183
for _, e := range errs {
185184
errstringSb.WriteString(e.Error() + "\n")
186185
}
187-
errstring += errstringSb.String()
188-
ctx.ServerError("AuthorizeOAuth: Validate: ", fmt.Errorf("errors occurred during validation: %s", errstring))
186+
ctx.ServerError("AuthorizeOAuth: Validate: ", fmt.Errorf("errors occurred during validation: %s", errstringSb.String()))
189187
return
190188
}
191189

routers/web/user/setting/keys.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,12 @@ func KeysPost(ctx *context.Context) {
132132
}
133133
return
134134
}
135-
keyIDs := ""
136135
var keyIDsSb strings.Builder
137136
for _, key := range keys {
138137
keyIDsSb.WriteString(key.KeyID)
139138
keyIDsSb.WriteString(", ")
140139
}
141-
keyIDs += keyIDsSb.String()
140+
keyIDs := keyIDsSb.String()
142141
if len(keyIDs) > 0 {
143142
keyIDs = keyIDs[:len(keyIDs)-2]
144143
}

0 commit comments

Comments
 (0)