Fix some slice append usages (#26778)

Co-authored-by: delvh <dev.lh@web.de>

diff --git a/modules/setting/service.go b/modules/setting/service.go
index 595ea6528f886352fb175bc06bc7b7e85fe0a495..74a7e90f7c880657f80eb7e01ea608afb1f35ca3 100644 (file)
--- a/modules/setting/service.go
+++ b/modules/setting/service.go
@@ -223,7 +223,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
        Service.UserDeleteWithCommentsMaxTime = sec.Key("USER_DELETE_WITH_COMMENTS_MAX_TIME").MustDuration(0)
        sec.Key("VALID_SITE_URL_SCHEMES").MustString("http,https")
        Service.ValidSiteURLSchemes = sec.Key("VALID_SITE_URL_SCHEMES").Strings(",")
-       schemes := make([]string, len(Service.ValidSiteURLSchemes))
+       schemes := make([]string, 0, len(Service.ValidSiteURLSchemes))
        for _, scheme := range Service.ValidSiteURLSchemes {
                scheme = strings.ToLower(strings.TrimSpace(scheme))
                if scheme != "" {

diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index a507c1f44d171e4faaeee85db989dce0a819007b..58f2fc69cea8ea0c814a748ed86950c67fb72331 100644 (file)
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -326,11 +326,9 @@ func CreatePullRequest(ctx *context.APIContext) {
                        return
                }
 
-               labelIDs = make([]int64, len(form.Labels))
-               orgLabelIDs := make([]int64, len(form.Labels))
-
-               for i := range labels {
-                       labelIDs[i] = labels[i].ID
+               labelIDs = make([]int64, 0, len(labels))
+               for _, label := range labels {
+                       labelIDs = append(labelIDs, label.ID)
                }
 
                if ctx.Repo.Owner.IsOrganization() {
@@ -340,12 +338,12 @@ func CreatePullRequest(ctx *context.APIContext) {
                                return
                        }
 
-                       for i := range orgLabels {
-                               orgLabelIDs[i] = orgLabels[i].ID
+                       orgLabelIDs := make([]int64, 0, len(orgLabels))
+                       for _, orgLabel := range orgLabels {
+                               orgLabelIDs = append(orgLabelIDs, orgLabel.ID)
                        }
+                       labelIDs = append(labelIDs, orgLabelIDs...)
                }
-
-               labelIDs = append(labelIDs, orgLabelIDs...)
        }
 
        if form.Milestone > 0 {

diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go
index a086d15a4f99e682f497618f93da22125f6bf36e..7f6b8137ae195b4a0588853725cc6c7e2a6fa901 100644 (file)
--- a/services/repository/files/temp_repo.go
+++ b/services/repository/files/temp_repo.go
@@ -114,12 +114,12 @@ func (t *TemporaryUploadRepository) LsFiles(filenames ...string) ([]string, erro
                return nil, err
        }
 
-       filelist := make([]string, len(filenames))
+       fileList := make([]string, 0, len(filenames))
        for _, line := range bytes.Split(stdOut.Bytes(), []byte{'\000'}) {
-               filelist = append(filelist, string(line))
+               fileList = append(fileList, string(line))
        }
 
-       return filelist, nil
+       return fileList, nil
 }
 
 // RemoveFilesFromIndex removes the given files from the index