Skip to content

Commit 4013f3f

Browse files
GiteaBotharryzcydelvh
authored
Fix some slice append usages (#26778) (#26798)
Backport #26778 by @harryzcy Co-authored-by: Chongyi Zheng <[email protected]> Co-authored-by: delvh <[email protected]>
1 parent 3bab204 commit 4013f3f

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

modules/setting/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
221221
Service.UserDeleteWithCommentsMaxTime = sec.Key("USER_DELETE_WITH_COMMENTS_MAX_TIME").MustDuration(0)
222222
sec.Key("VALID_SITE_URL_SCHEMES").MustString("http,https")
223223
Service.ValidSiteURLSchemes = sec.Key("VALID_SITE_URL_SCHEMES").Strings(",")
224-
schemes := make([]string, len(Service.ValidSiteURLSchemes))
224+
schemes := make([]string, 0, len(Service.ValidSiteURLSchemes))
225225
for _, scheme := range Service.ValidSiteURLSchemes {
226226
scheme = strings.ToLower(strings.TrimSpace(scheme))
227227
if scheme != "" {

routers/api/v1/repo/pull.go

+7-9
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,9 @@ func CreatePullRequest(ctx *context.APIContext) {
326326
return
327327
}
328328

329-
labelIDs = make([]int64, len(form.Labels))
330-
orgLabelIDs := make([]int64, len(form.Labels))
331-
332-
for i := range labels {
333-
labelIDs[i] = labels[i].ID
329+
labelIDs = make([]int64, 0, len(labels))
330+
for _, label := range labels {
331+
labelIDs = append(labelIDs, label.ID)
334332
}
335333

336334
if ctx.Repo.Owner.IsOrganization() {
@@ -340,12 +338,12 @@ func CreatePullRequest(ctx *context.APIContext) {
340338
return
341339
}
342340

343-
for i := range orgLabels {
344-
orgLabelIDs[i] = orgLabels[i].ID
341+
orgLabelIDs := make([]int64, 0, len(orgLabels))
342+
for _, orgLabel := range orgLabels {
343+
orgLabelIDs = append(orgLabelIDs, orgLabel.ID)
345344
}
345+
labelIDs = append(labelIDs, orgLabelIDs...)
346346
}
347-
348-
labelIDs = append(labelIDs, orgLabelIDs...)
349347
}
350348

351349
if form.Milestone > 0 {

services/repository/files/temp_repo.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ func (t *TemporaryUploadRepository) LsFiles(filenames ...string) ([]string, erro
114114
return nil, err
115115
}
116116

117-
filelist := make([]string, len(filenames))
117+
fileList := make([]string, 0, len(filenames))
118118
for _, line := range bytes.Split(stdOut.Bytes(), []byte{'\000'}) {
119-
filelist = append(filelist, string(line))
119+
fileList = append(fileList, string(line))
120120
}
121121

122-
return filelist, nil
122+
return fileList, nil
123123
}
124124

125125
// RemoveFilesFromIndex removes the given files from the index

0 commit comments

Comments
 (0)