refactor: append, build variable and type switch (go-gitea#4940)

* refactor: append, build variable and type switch

* fix: remove redundant space.

integrations/links_test.go

@@ -110,7 +110,7 @@ func testLinksAsUser(userName string, t *testing.T) {
 	reqAPI := NewRequestf(t, "GET", "/api/v1/users/%s/repos", userName)
 	respAPI := MakeRequest(t, reqAPI, http.StatusOK)
 
-	var apiRepos []api.Repository
+	var apiRepos []*api.Repository
 	DecodeJSON(t, respAPI, &apiRepos)
 
 	var repoLinks = []string{

models/issue_assignees_test.go

@@ -43,8 +43,7 @@ func TestUpdateAssignee(t *testing.T) {
 	assert.NoError(t, err)
 
 	var expectedAssignees []*User
-	expectedAssignees = append(expectedAssignees, user2)
-	expectedAssignees = append(expectedAssignees, user3)
+	expectedAssignees = append(expectedAssignees, user2, user3)
 
 	for in, assignee := range assignees {
 		assert.Equal(t, assignee.ID, expectedAssignees[in].ID)

models/migrations/v64.go

@@ -83,7 +83,7 @@ func addMultipleAssignees(x *xorm.Engine) error {
 		return err
 	}
 
-	allIssues := []Issue{}
+	allIssues := []*Issue{}
 	if err := sess.Find(&allIssues); err != nil {
 		return err
 	}
@@ -104,7 +104,7 @@ func addMultipleAssignees(x *xorm.Engine) error {
 		return err
 	}
 
-	allAssignementComments := []Comment{}
+	allAssignementComments := []*Comment{}
 	if err := sess.Where("type = ?", 9).Find(&allAssignementComments); err != nil {
 		return err
 	}

models/user.go

@@ -13,9 +13,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-
-	// Needed for jpeg support
-	_ "image/jpeg"
+	_ "image/jpeg" // Needed for jpeg support
 	"image/png"
 	"os"
 	"path/filepath"
@@ -1622,7 +1620,7 @@ func SyncExternalUsers() {
 			var sshKeysNeedUpdate bool
 
 			// Find all users with this login type
-			var users []User
+			var users []*User
 			x.Where("login_type = ?", LoginLDAP).
 				And("login_source = ?", s.ID).
 				Find(&users)
@@ -1641,7 +1639,7 @@ func SyncExternalUsers() {
 				// Search for existing user
 				for _, du := range users {
 					if du.LowerName == strings.ToLower(su.Username) {
-						usr = &du
+						usr = du
 						break
 					}
 				}
@@ -1724,7 +1722,7 @@ func SyncExternalUsers() {
 						log.Trace("SyncExternalUsers[%s]: Deactivating user %s", s.Name, usr.Name)
 
 						usr.IsActive = false
-						err = UpdateUserCols(&usr, "is_active")
+						err = UpdateUserCols(usr, "is_active")
 						if err != nil {
 							log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", s.Name, usr.Name, err)
 						}

modules/base/tool.go

@@ -465,41 +465,41 @@ func Subtract(left interface{}, right interface{}) interface{} {
 	var rleft, rright int64
 	var fleft, fright float64
 	var isInt = true
-	switch left := left.(type) {
+	switch v := left.(type) {
 	case int:
-		rleft = int64(left)
+		rleft = int64(v)
 	case int8:
-		rleft = int64(left)
+		rleft = int64(v)
 	case int16:
-		rleft = int64(left)
+		rleft = int64(v)
 	case int32:
-		rleft = int64(left)
+		rleft = int64(v)
 	case int64:
-		rleft = left
+		rleft = v
 	case float32:
-		fleft = float64(left)
+		fleft = float64(v)
 		isInt = false
 	case float64:
-		fleft = left
+		fleft = v
 		isInt = false
 	}
 
-	switch right := right.(type) {
+	switch v := right.(type) {
 	case int:
-		rright = int64(right)
+		rright = int64(v)
 	case int8:
-		rright = int64(right)
+		rright = int64(v)
 	case int16:
-		rright = int64(right)
+		rright = int64(v)
 	case int32:
-		rright = int64(right)
+		rright = int64(v)
 	case int64:
-		rright = right
+		rright = v
 	case float32:
-		fright = float64(right)
+		fright = float64(v)
 		isInt = false
 	case float64:
-		fright = right
+		fright = v
 		isInt = false
 	}
 

modules/base/tool_test.go

@@ -306,21 +306,21 @@ func TestFileSize(t *testing.T) {
 
 func TestSubtract(t *testing.T) {
 	toFloat64 := func(n interface{}) float64 {
-		switch n := n.(type) {
+		switch v := n.(type) {
 		case int:
-			return float64(n)
+			return float64(v)
 		case int8:
-			return float64(n)
+			return float64(v)
 		case int16:
-			return float64(n)
+			return float64(v)
 		case int32:
-			return float64(n)
+			return float64(v)
 		case int64:
-			return float64(n)
+			return float64(v)
 		case float32:
-			return float64(n)
+			return float64(v)
 		case float64:
-			return n
+			return v
 		default:
 			return 0.0
 		}

modules/templates/helper.go

@@ -156,8 +156,7 @@ func NewFuncMap() []template.FuncMap {
 			var path []string
 			index := strings.LastIndex(str, "/")
 			if index != -1 && index != len(str) {
-				path = append(path, str[0:index+1])
-				path = append(path, str[index+1:])
+				path = append(path, str[0:index+1], str[index+1:])
 			} else {
 				path = append(path, str)
 			}
@@ -330,10 +329,10 @@ func ToUTF8(content string) string {
 	return res
 }
 
-// ReplaceLeft replaces all prefixes 'old' in 's' with 'new'.
-func ReplaceLeft(s, old, new string) string {
-	oldLen, newLen, i, n := len(old), len(new), 0, 0
-	for ; i < len(s) && strings.HasPrefix(s[i:], old); n++ {
+// ReplaceLeft replaces all prefixes 'oldS' in 's' with 'newS'.
+func ReplaceLeft(s, oldS, newS string) string {
+	oldLen, newLen, i, n := len(oldS), len(newS), 0, 0
+	for ; i < len(s) && strings.HasPrefix(s[i:], oldS); n++ {
 		i += oldLen
 	}
 
@@ -348,7 +347,7 @@ func ReplaceLeft(s, old, new string) string {
 
 	j := 0
 	for ; j < n*newLen; j += newLen {
-		copy(replacement[j:j+newLen], new)
+		copy(replacement[j:j+newLen], newS)
 	}
 
 	copy(replacement[j:], s[i:])

routers/user/auth_openid.go

@@ -359,11 +359,11 @@ func RegisterOpenIDPost(ctx *context.Context, cpt *captcha.Captcha, form auth.Si
 		}
 	}
 
-	len := setting.MinPasswordLength
-	if len < 256 {
-		len = 256
+	length := setting.MinPasswordLength
+	if length < 256 {
+		length = 256
 	}
-	password, err := generate.GetRandomString(len)
+	password, err := generate.GetRandomString(length)
 	if err != nil {
 		ctx.RenderWithErr(err.Error(), tplSignUpOID, form)
 		return