Skip to content

Commit

Permalink
Fix some slice append usages (#26778) (#26798)
Browse files Browse the repository at this point in the history
Backport #26778 by @harryzcy

Co-authored-by: Chongyi Zheng <git@zcy.dev>
Co-authored-by: delvh <dev.lh@web.de>
  • Loading branch information
3 people authored Aug 29, 2023
1 parent 3bab204 commit 4013f3f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion modules/setting/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,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 != "" {
Expand Down
16 changes: 7 additions & 9 deletions routers/api/v1/repo/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions services/repository/files/temp_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4013f3f

Please sign in to comment.