Fix some lints (#17337)

Fix some linting problems.
tokarchuk/v1.17
Lunny Xiao 3 years ago committed by GitHub
parent 5326f4c9c5
commit 4a57c9ea17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      modules/git/submodule.go
  2. 2
      modules/gitgraph/graph_models.go
  3. 4
      modules/graceful/restart_unix.go
  4. 2
      modules/indexer/stats/queue.go
  5. 4
      modules/lfs/endpoint.go
  6. 6
      modules/markup/common/footnote.go
  7. 2
      services/pull/check.go
  8. 5
      services/repository/push.go

@ -52,9 +52,7 @@ func getRefURL(refURL, urlPrefix, repoFullName, sshDomain string) string {
urlPrefixHostname = prefixURL.Host
}
if strings.HasSuffix(urlPrefix, "/") {
urlPrefix = urlPrefix[:len(urlPrefix)-1]
}
urlPrefix = strings.TrimSuffix(urlPrefix, "/")
// FIXME: Need to consider branch - which will require changes in modules/git/commit.go:GetSubModules
// Relative url prefix check (according to git submodule documentation)

@ -220,7 +220,7 @@ func newRefsFromRefNames(refNames []byte) []git.Reference {
refName := string(refNameBytes)
if strings.HasPrefix(refName, "tag: ") {
refName = strings.TrimPrefix(refName, "tag: ")
} else if strings.HasPrefix(refName, "HEAD -> ") {
} else {
refName = strings.TrimPrefix(refName, "HEAD -> ")
}
refs = append(refs, git.Reference{

@ -55,7 +55,9 @@ func RestartProcess() (int, error) {
unixListener.SetUnlinkOnClose(false)
}
// Remember to close these at the end.
defer files[i].Close()
defer func(i int) {
_ = files[i].Close()
}(i)
}
// Use the original binary location. This works with symlinks such that if

@ -27,7 +27,7 @@ func handle(data ...queue.Data) {
}
func initStatsQueue() error {
statsQueue = queue.CreateUniqueQueue("repo_stats_update", handle, int64(0)).(queue.UniqueQueue)
statsQueue = queue.CreateUniqueQueue("repo_stats_update", handle, int64(0))
if statsQueue == nil {
return fmt.Errorf("Unable to create repo_stats_update Queue")
}

@ -29,9 +29,7 @@ func endpointFromCloneURL(rawurl string) *url.URL {
return ep
}
if strings.HasSuffix(ep.Path, "/") {
ep.Path = ep.Path[:len(ep.Path)-1]
}
ep.Path = strings.TrimSuffix(ep.Path, "/")
if ep.Scheme == "file" {
return ep

@ -125,9 +125,9 @@ type Footnote struct {
// Dump implements Node.Dump.
func (n *Footnote) Dump(source []byte, level int) {
m := map[string]string{}
m["Index"] = fmt.Sprintf("%v", n.Index)
m["Ref"] = fmt.Sprintf("%s", n.Ref)
m["Name"] = fmt.Sprintf("%v", n.Name)
m["Index"] = strconv.Itoa(n.Index)
m["Ref"] = string(n.Ref)
m["Name"] = string(n.Name)
ast.DumpHelper(n, source, level, m, nil)
}

@ -253,7 +253,7 @@ func CheckPrsForBaseBranch(baseRepo *models.Repository, baseBranchName string) e
// Init runs the task queue to test all the checking status pull requests
func Init() error {
prQueue = queue.CreateUniqueQueue("pr_patch_checker", handle, "").(queue.UniqueQueue)
prQueue = queue.CreateUniqueQueue("pr_patch_checker", handle, "")
if prQueue == nil {
return fmt.Errorf("Unable to create pr_patch_checker Queue")

@ -5,6 +5,7 @@
package repository
import (
"errors"
"fmt"
"time"
@ -36,9 +37,9 @@ func handle(data ...queue.Data) {
}
func initPushQueue() error {
pushQueue = queue.CreateQueue("push_update", handle, []*repo_module.PushUpdateOptions{}).(queue.Queue)
pushQueue = queue.CreateQueue("push_update", handle, []*repo_module.PushUpdateOptions{})
if pushQueue == nil {
return fmt.Errorf("Unable to create push_update Queue")
return errors.New("unable to create push_update Queue")
}
go graceful.GetManager().RunWithShutdownFns(pushQueue.Run)

Loading…
Cancel
Save