Merge pull request 'Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.60.1 (forgejo)' (#4953) from renovate/forgejo-github.com-golangci-golangci-lint-cmd-golangci-lint-1.x into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4953
Reviewed-by: Gusted <gusted@noreply.codeberg.org>

modules/cache/context.go

@@ -73,7 +73,9 @@ func (cc *cacheContext) Expired() bool {
 	return timeNow().Sub(cc.created) > cacheContextLifetime
 }
 
-var cacheContextKey = struct{}{}
+type cacheContextType = struct{ useless struct{} }
+
+var cacheContextKey = cacheContextType{useless: struct{}{}}
 
 /*
 Since there are both WithCacheContext and WithNoCacheContext,

modules/git/log_name_status.go

@@ -114,7 +114,7 @@ type LogNameStatusCommitData struct {
 // Next returns the next LogStatusCommitData
 func (g *LogNameStatusRepoParser) Next(treepath string, paths2ids map[string]int, changed []bool, maxpathlen int) (*LogNameStatusCommitData, error) {
 	var err error
-	if g.next == nil || len(g.next) == 0 {
+	if len(g.next) == 0 {
 		g.buffull = false
 		g.next, err = g.rd.ReadSlice('\x00')
 		if err != nil {

modules/issue/template/template.go

@@ -401,7 +401,7 @@ func (f *valuedField) Render() string {
 }
 
 func (f *valuedField) Value() string {
-	return strings.TrimSpace(f.Get(fmt.Sprintf("form-field-" + f.ID)))
+	return strings.TrimSpace(f.Get("form-field-" + f.ID))
 }
 
 func (f *valuedField) Options() []*valuedOption {

modules/packages/arch/metadata.go

@@ -258,42 +258,42 @@ func ValidatePackageSpec(p *Package) error {
 	}
 	for _, cd := range p.VersionMetadata.CheckDepends {
 		if !rePkgVer.MatchString(cd) {
-			return util.NewInvalidArgumentErrorf("invalid check dependency: " + cd)
+			return util.NewInvalidArgumentErrorf("invalid check dependency: %s", cd)
 		}
 	}
 	for _, d := range p.VersionMetadata.Depends {
 		if !rePkgVer.MatchString(d) {
-			return util.NewInvalidArgumentErrorf("invalid dependency: " + d)
+			return util.NewInvalidArgumentErrorf("invalid dependency: %s", d)
 		}
 	}
 	for _, md := range p.VersionMetadata.MakeDepends {
 		if !rePkgVer.MatchString(md) {
-			return util.NewInvalidArgumentErrorf("invalid make dependency: " + md)
+			return util.NewInvalidArgumentErrorf("invalid make dependency: %s", md)
 		}
 	}
 	for _, p := range p.VersionMetadata.Provides {
 		if !rePkgVer.MatchString(p) {
-			return util.NewInvalidArgumentErrorf("invalid provides: " + p)
+			return util.NewInvalidArgumentErrorf("invalid provides: %s", p)
 		}
 	}
 	for _, p := range p.VersionMetadata.Conflicts {
 		if !rePkgVer.MatchString(p) {
-			return util.NewInvalidArgumentErrorf("invalid conflicts: " + p)
+			return util.NewInvalidArgumentErrorf("invalid conflicts: %s", p)
 		}
 	}
 	for _, p := range p.VersionMetadata.Replaces {
 		if !rePkgVer.MatchString(p) {
-			return util.NewInvalidArgumentErrorf("invalid replaces: " + p)
+			return util.NewInvalidArgumentErrorf("invalid replaces: %s", p)
 		}
 	}
 	for _, p := range p.VersionMetadata.Replaces {
 		if !rePkgVer.MatchString(p) {
-			return util.NewInvalidArgumentErrorf("invalid xdata: " + p)
+			return util.NewInvalidArgumentErrorf("invalid xdata: %s", p)
 		}
 	}
 	for _, od := range p.VersionMetadata.OptDepends {
 		if !reOptDep.MatchString(od) {
-			return util.NewInvalidArgumentErrorf("invalid optional dependency: " + od)
+			return util.NewInvalidArgumentErrorf("invalid optional dependency: %s", od)
 		}
 	}
 	for _, bf := range p.VersionMetadata.Backup {

modules/queue/base_channel.go

@@ -120,7 +120,7 @@ func (q *baseChannel) RemoveAll(ctx context.Context) error {
 	q.mu.Lock()
 	defer q.mu.Unlock()
 
-	for q.c != nil && len(q.c) > 0 {
+	for len(q.c) > 0 {
 		<-q.c
 	}
 

modules/queue/workerqueue_test.go

@@ -173,8 +173,8 @@ func testWorkerPoolQueuePersistence(t *testing.T, queueSetting setting.QueueSett
 
 	q2() // restart the queue to continue to execute the tasks in it
 
-	assert.NotZero(t, len(tasksQ1))
-	assert.NotZero(t, len(tasksQ2))
+	assert.NotEmpty(t, tasksQ1)
+	assert.NotEmpty(t, tasksQ2)
 	assert.EqualValues(t, testCount, len(tasksQ1)+len(tasksQ2))
 }