Skip to content

Commit f4d3aae

Browse files
authored
refactor: remove redundant err declarations (#32381)
1 parent dd1f674 commit f4d3aae

File tree

11 files changed

+3
-20
lines changed

11 files changed

+3
-20
lines changed

build/generate-emoji.go

-4
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ func (e Emoji) MarshalJSON() ([]byte, error) {
5353
}
5454

5555
func main() {
56-
var err error
57-
5856
flag.Parse()
5957

6058
// generate data
@@ -83,8 +81,6 @@ var replacer = strings.NewReplacer(
8381
var emojiRE = regexp.MustCompile(`\{Emoji:"([^"]*)"`)
8482

8583
func generate() ([]byte, error) {
86-
var err error
87-
8884
// load gemoji data
8985
res, err := http.Get(gemojiURL)
9086
if err != nil {

models/git/lfs.go

-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ var ErrLFSObjectNotExist = db.ErrNotExist{Resource: "LFS Meta object"}
136136
// NewLFSMetaObject stores a given populated LFSMetaObject structure in the database
137137
// if it is not already present.
138138
func NewLFSMetaObject(ctx context.Context, repoID int64, p lfs.Pointer) (*LFSMetaObject, error) {
139-
var err error
140-
141139
ctx, committer, err := db.TxContext(ctx)
142140
if err != nil {
143141
return nil, err

models/issues/label_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ func TestGetLabelsByOrgID(t *testing.T) {
229229
testSuccess(3, "reversealphabetically", []int64{4, 3})
230230
testSuccess(3, "default", []int64{3, 4})
231231

232-
var err error
233-
_, err = issues_model.GetLabelsByOrgID(db.DefaultContext, 0, "leastissues", db.ListOptions{})
232+
_, err := issues_model.GetLabelsByOrgID(db.DefaultContext, 0, "leastissues", db.ListOptions{})
234233
assert.True(t, issues_model.IsErrOrgLabelNotExist(err))
235234

236235
_, err = issues_model.GetLabelsByOrgID(db.DefaultContext, -1, "leastissues", db.ListOptions{})

modules/charset/charset_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,12 @@ func TestMaybeRemoveBOM(t *testing.T) {
4040

4141
func TestToUTF8(t *testing.T) {
4242
resetDefaultCharsetsOrder()
43-
var res string
44-
var err error
4543

4644
// Note: golang compiler seems so behave differently depending on the current
4745
// locale, so some conversions might behave differently. For that reason, we don't
4846
// depend on particular conversions but in expected behaviors.
4947

50-
res, err = ToUTF8([]byte{0x41, 0x42, 0x43}, ConvertOpts{})
48+
res, err := ToUTF8([]byte{0x41, 0x42, 0x43}, ConvertOpts{})
5149
assert.NoError(t, err)
5250
assert.Equal(t, "ABC", res)
5351

modules/markup/markdown/goldmark.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node
213213
return ast.WalkContinue, nil
214214
}
215215

216-
var err error
217-
_, err = w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))
216+
_, err := w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))
218217
if err != nil {
219218
return ast.WalkStop, err
220219
}

routers/api/v1/repo/repo.go

-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ func Search(ctx *context.APIContext) {
202202
}
203203
}
204204

205-
var err error
206205
repos, count, err := repo_model.SearchRepository(ctx, opts)
207206
if err != nil {
208207
ctx.JSON(http.StatusInternalServerError, api.SearchError{

routers/api/v1/user/repo.go

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ func ListMyRepos(ctx *context.APIContext) {
111111
IncludeDescription: true,
112112
}
113113

114-
var err error
115114
repos, count, err := repo_model.SearchRepository(ctx, opts)
116115
if err != nil {
117116
ctx.Error(http.StatusInternalServerError, "SearchRepository", err)

routers/web/repo/actions/view.go

-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ func ViewPost(ctx *context_module.Context) {
276276
if validCursor {
277277
length := step.LogLength - cursor.Cursor
278278
offset := task.LogIndexes[index]
279-
var err error
280279
logRows, err := actions.ReadLogs(ctx, task.LogInStorage, task.LogFilename, offset, length)
281280
if err != nil {
282281
ctx.Error(http.StatusInternalServerError, err.Error())

routers/web/repo/activity.go

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ func ActivityAuthors(ctx *context.Context) {
9494
timeFrom = timeUntil.Add(-time.Hour * 168)
9595
}
9696

97-
var err error
9897
authors, err := activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10)
9998
if err != nil {
10099
ctx.ServerError("GetActivityStatsTopAuthors", err)

routers/web/repo/view.go

-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ func findReadmeFileInEntries(ctx *context.Context, entries []*git.TreeEntry, try
143143
// this should be impossible; if subTreeEntry exists so should this.
144144
continue
145145
}
146-
var err error
147146
childEntries, err := subTree.ListEntries()
148147
if err != nil {
149148
return "", nil, err

services/issue/template.go

-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ func GetTemplateConfig(gitRepo *git.Repository, path string, commit *git.Commit)
5252
return GetDefaultTemplateConfig(), nil
5353
}
5454

55-
var err error
56-
5755
treeEntry, err := commit.GetTreeEntryByPath(path)
5856
if err != nil {
5957
return GetDefaultTemplateConfig(), err

0 commit comments

Comments
 (0)