aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Redko <oleksandr.red+github@gmail.com>2024-10-30 21:36:24 +0200
committerGitHub <noreply@github.com>2024-10-30 19:36:24 +0000
commitf4d3aaeeb9e1b11c5495e4608a3f52f316c35758 (patch)
treee2601e11bc483e16e07afeaa0c31ad55021fe0d8
parentdd1f67491f5e2f798a537a61c082b1bf12e47635 (diff)
downloadgitea-f4d3aaeeb9e1b11c5495e4608a3f52f316c35758.tar.gz
gitea-f4d3aaeeb9e1b11c5495e4608a3f52f316c35758.zip
refactor: remove redundant err declarations (#32381)
-rw-r--r--build/generate-emoji.go4
-rw-r--r--models/git/lfs.go2
-rw-r--r--models/issues/label_test.go3
-rw-r--r--modules/charset/charset_test.go4
-rw-r--r--modules/markup/markdown/goldmark.go3
-rw-r--r--routers/api/v1/repo/repo.go1
-rw-r--r--routers/api/v1/user/repo.go1
-rw-r--r--routers/web/repo/actions/view.go1
-rw-r--r--routers/web/repo/activity.go1
-rw-r--r--routers/web/repo/view.go1
-rw-r--r--services/issue/template.go2
11 files changed, 3 insertions, 20 deletions
diff --git a/build/generate-emoji.go b/build/generate-emoji.go
index 17a9670f06..446ab5f440 100644
--- 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 837dc9fd31..bb6361050a 100644
--- 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 396de809e1..a0cc8e6d75 100644
--- 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 829844a976..19b1303365 100644
--- 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 a89670eeef..515a79578d 100644
--- 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 4638e2ba5c..698ba3cc94 100644
--- 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 d0264d6b5a..6111341423 100644
--- 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 11199d69eb..20e29425a3 100644
--- 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 c8fa60f77a..4b14c28b3e 100644
--- 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 9769117609..7d9281b397 100644
--- 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 dd9d015f0f..4b0f1aa987 100644
--- 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