mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 03:02:14 +01:00 
			
		
		
		
	refactor: remove redundant err declarations (#32381)
This commit is contained in:
		
							parent
							
								
									dd1f67491f
								
							
						
					
					
						commit
						f4d3aaeeb9
					
				| @ -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 { | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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{}) | ||||
|  | ||||
| @ -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) | ||||
| 
 | ||||
|  | ||||
| @ -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 | ||||
| 	} | ||||
|  | ||||
| @ -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{ | ||||
|  | ||||
| @ -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) | ||||
|  | ||||
| @ -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()) | ||||
|  | ||||
| @ -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) | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user