refactor: remove redundant err declarations (#32381)

diff --git a/build/generate-emoji.go b/build/generate-emoji.go
index 17a9670f06a31fa4731cff47b295ce6ce7f86f73..446ab5f440582fadfd14773dcffc61779a6310b5 100644 (file)
--- a/build/generate-emoji.go
+++ b/build/generate-emoji.go
@@ -53,8 +53,6 @@ func (e Emoji) MarshalJSON() ([]byte, error) {
 }
 
 func main() {
-       var err error
-
        flag.Parse()
 
        // generate data
@@ -83,8 +81,6 @@ var replacer = strings.NewReplacer(
 var emojiRE = regexp.MustCompile(`\{Emoji:"([^"]*)"`)
 
 func generate() ([]byte, error) {
-       var err error
-
        // load gemoji data
        res, err := http.Get(gemojiURL)
        if err != nil {

diff --git a/models/git/lfs.go b/models/git/lfs.go
index 837dc9fd312f5a938cee346f10eb645fa93b7fa0..bb6361050aaefc7516f57dd597f7e52eea388022 100644 (file)
--- a/models/git/lfs.go
+++ b/models/git/lfs.go
@@ -136,8 +136,6 @@ var ErrLFSObjectNotExist = db.ErrNotExist{Resource: "LFS Meta object"}
 // NewLFSMetaObject stores a given populated LFSMetaObject structure in the database
 // if it is not already present.
 func NewLFSMetaObject(ctx context.Context, repoID int64, p lfs.Pointer) (*LFSMetaObject, error) {
-       var err error
-
        ctx, committer, err := db.TxContext(ctx)
        if err != nil {
                return nil, err

diff --git a/models/issues/label_test.go b/models/issues/label_test.go
index 396de809e1d817431dd035f3a486436514777895..a0cc8e6d7564050e3cd7139e77e0668285625821 100644 (file)
--- a/models/issues/label_test.go
+++ b/models/issues/label_test.go
@@ -229,8 +229,7 @@ func TestGetLabelsByOrgID(t *testing.T) {
        testSuccess(3, "reversealphabetically", []int64{4, 3})
        testSuccess(3, "default", []int64{3, 4})
 
-       var err error
-       _, err = issues_model.GetLabelsByOrgID(db.DefaultContext, 0, "leastissues", db.ListOptions{})
+       _, err := issues_model.GetLabelsByOrgID(db.DefaultContext, 0, "leastissues", db.ListOptions{})
        assert.True(t, issues_model.IsErrOrgLabelNotExist(err))
 
        _, err = issues_model.GetLabelsByOrgID(db.DefaultContext, -1, "leastissues", db.ListOptions{})

diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go
index 829844a9766cd335a6f87638be8c9c13aca371bc..19b1303365758a5a73f4ffac3c79ecab7ff5f3e3 100644 (file)
--- a/modules/charset/charset_test.go
+++ b/modules/charset/charset_test.go
@@ -40,14 +40,12 @@ func TestMaybeRemoveBOM(t *testing.T) {
 
 func TestToUTF8(t *testing.T) {
        resetDefaultCharsetsOrder()
-       var res string
-       var err error
 
        // Note: golang compiler seems so behave differently depending on the current
        // locale, so some conversions might behave differently. For that reason, we don't
        // depend on particular conversions but in expected behaviors.
 
-       res, err = ToUTF8([]byte{0x41, 0x42, 0x43}, ConvertOpts{})
+       res, err := ToUTF8([]byte{0x41, 0x42, 0x43}, ConvertOpts{})
        assert.NoError(t, err)
        assert.Equal(t, "ABC", res)
 

diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go
index a89670eeefdc80ee0868c46968895c734e28ae04..515a79578deae5688b21040b287adf7025ae435d 100644 (file)
--- a/modules/markup/markdown/goldmark.go
+++ b/modules/markup/markdown/goldmark.go
@@ -213,8 +213,7 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node
                return ast.WalkContinue, nil
        }
 
-       var err error
-       _, err = w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))
+       _, err := w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))
        if err != nil {
                return ast.WalkStop, err
        }

diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 4638e2ba5c3a7afd78250d18612409b92fcd55f1..698ba3cc949d5d8cb3dcbb1cdc199ab9b395ccb6 100644 (file)
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -202,7 +202,6 @@ func Search(ctx *context.APIContext) {
                }
        }
 
-       var err error
        repos, count, err := repo_model.SearchRepository(ctx, opts)
        if err != nil {
                ctx.JSON(http.StatusInternalServerError, api.SearchError{

diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go
index d0264d6b5a2618f0b94b10f5207ab3741952ee20..611134142311be29538ff70345c540fcc3dc718c 100644 (file)
--- a/routers/api/v1/user/repo.go
+++ b/routers/api/v1/user/repo.go
@@ -111,7 +111,6 @@ func ListMyRepos(ctx *context.APIContext) {
                IncludeDescription: true,
        }
 
-       var err error
        repos, count, err := repo_model.SearchRepository(ctx, opts)
        if err != nil {
                ctx.Error(http.StatusInternalServerError, "SearchRepository", err)

diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index 11199d69eb3b2bf7d26914337e6a693416caaaf1..20e29425a39c438278fce181a36f737d94799397 100644 (file)
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -276,7 +276,6 @@ func ViewPost(ctx *context_module.Context) {
                        if validCursor {
                                length := step.LogLength - cursor.Cursor
                                offset := task.LogIndexes[index]
-                               var err error
                                logRows, err := actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length)
                                if err != nil {
                                        ctx.Error(http.StatusInternalServerError, err.Error())

diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go
index c8fa60f77a74a9186c4edf71a84eb035d3bfab64..4b14c28b3e635bb1e6c4ad8e1ca1f754f8b9537b 100644 (file)
--- a/routers/web/repo/activity.go
+++ b/routers/web/repo/activity.go
@@ -94,7 +94,6 @@ func ActivityAuthors(ctx *context.Context) {
                timeFrom = timeUntil.Add(-time.Hour * 168)
        }
 
-       var err error
        authors, err := activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10)
        if err != nil {
                ctx.ServerError("GetActivityStatsTopAuthors", err)

diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 976911760948500fd0b325b29e4395f926ca4036..7d9281b3973875b6d0a5f9c191f38658d80bfdfa 100644 (file)
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -143,7 +143,6 @@ func findReadmeFileInEntries(ctx *context.Context, entries []*git.TreeEntry, try
                                // this should be impossible; if subTreeEntry exists so should this.
                                continue
                        }
-                       var err error
                        childEntries, err := subTree.ListEntries()
                        if err != nil {
                                return "", nil, err

diff --git a/services/issue/template.go b/services/issue/template.go
index dd9d015f0fa0f1cb84cd9bd7b7955d4d50732542..4b0f1aa98704729704793c49545f9c24f3cc553f 100644 (file)
--- a/services/issue/template.go
+++ b/services/issue/template.go
@@ -52,8 +52,6 @@ func GetTemplateConfig(gitRepo *git.Repository, path string, commit *git.Commit)
                return GetDefaultTemplateConfig(), nil
        }
 
-       var err error
-
        treeEntry, err := commit.GetTreeEntryByPath(path)
        if err != nil {
                return GetDefaultTemplateConfig(), err