6 files changed, 10 insertions, 12 deletions
diff --git a/modules/git/submodule.go b/modules/git/submodule.go
index 231827f1e9..ee61f61179 100644
--- a/modules/git/submodule.go
+++ b/modules/git/submodule.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)
diff --git a/modules/gitgraph/graph_models.go b/modules/gitgraph/graph_models.go
index 86bd8cb237..95f761742e 100644
--- a/modules/gitgraph/graph_models.go
+++ b/modules/gitgraph/graph_models.go
@@ -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{
diff --git a/modules/graceful/restart_unix.go b/modules/graceful/restart_unix.go
index 392ed60cb3..9969e007c3 100644
--- a/modules/graceful/restart_unix.go
+++ b/modules/graceful/restart_unix.go
@@ -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
diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go
index 8309cfcd3b..fde3f2ff01 100644
--- a/modules/indexer/stats/queue.go
+++ b/modules/indexer/stats/queue.go
@@ -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")
 	}
diff --git a/modules/lfs/endpoint.go b/modules/lfs/endpoint.go
index add16ce9f1..943966ed15 100644
--- a/modules/lfs/endpoint.go
+++ b/modules/lfs/endpoint.go
@@ -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
diff --git a/modules/markup/common/footnote.go b/modules/markup/common/footnote.go
index 9baf8a4998..bc53d56f2b 100644
--- a/modules/markup/common/footnote.go
+++ b/modules/markup/common/footnote.go
@@ -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)
 }