all: A few more interesting linter fixes (#5502)

A couple of minor bugs and simplifications

cmd/stdiscosrv/main.go

@@ -88,11 +88,6 @@ var (
 )
 
 func main() {
-	const (
-		cleanIntv = 1 * time.Hour
-		statsIntv = 5 * time.Minute
-	)
-
 	var listen string
 	var dir string
 	var metricsListen string

cmd/stindex/idxck.go

@@ -167,8 +167,8 @@ func idxck(ldb *db.Lowlevel) (success bool) {
 		if needsLocally(vl) {
 			_, ok := needs[gk]
 			if !ok {
-				dev, _ := deviceToIDs[string(vl.Versions[0].Device)]
-				fi, _ := fileInfos[fileInfoKey{gk.folder, dev, gk.name}]
+				dev := deviceToIDs[string(vl.Versions[0].Device)]
+				fi := fileInfos[fileInfoKey{gk.folder, dev, gk.name}]
 				if !fi.IsDeleted() && !fi.IsIgnored() {
 					fmt.Printf("Missing need entry for needed file %q, folder %q\n", gk.name, folder)
 				}

cmd/strelaypoolsrv/stats.go

@@ -126,7 +126,7 @@ func refreshStats() {
 		go func(rel *relay) {
 			t0 := time.Now()
 			stats := fetchStats(rel)
-			duration := time.Now().Sub(t0).Seconds()
+			duration := time.Since(t0).Seconds()
 			result := "success"
 			if stats == nil {
 				result = "failed"

cmd/strelaysrv/session.go

@@ -22,7 +22,7 @@ import (
 var (
 	sessionMut      = sync.RWMutex{}
 	activeSessions  = make([]*session, 0)
-	pendingSessions = make(map[string]*session, 0)
+	pendingSessions = make(map[string]*session)
 	numProxies      int64
 	bytesProxied    int64
 )

cmd/syncthing/auditservice_test.go

@@ -37,7 +37,7 @@ func TestAuditService(t *testing.T) {
 	// This event should not be logged, since we have stopped.
 	events.Default.Log(events.ConfigSaved, "the third event")
 
-	result := string(buf.Bytes())
+	result := buf.String()
 	t.Log(result)
 
 	if strings.Contains(result, "first event") {

cmd/syncthing/gui.go

@@ -531,7 +531,6 @@ func corsMiddleware(next http.Handler, allowFrameLoading bool) http.Handler {
 
 		// For everything else, pass to the next handler
 		next.ServeHTTP(w, r)
-		return
 	})
 }
 

cmd/syncthing/locations.go

@@ -22,17 +22,17 @@ type locationEnum string
 // more meaningful.
 const (
 	locConfigFile    locationEnum = "config"
-	locCertFile                   = "certFile"
-	locKeyFile                    = "keyFile"
-	locHTTPSCertFile              = "httpsCertFile"
-	locHTTPSKeyFile               = "httpsKeyFile"
-	locDatabase                   = "database"
-	locLogFile                    = "logFile"
-	locCsrfTokens                 = "csrfTokens"
-	locPanicLog                   = "panicLog"
-	locAuditLog                   = "auditLog"
-	locGUIAssets                  = "GUIAssets"
-	locDefFolder                  = "defFolder"
+	locCertFile      locationEnum = "certFile"
+	locKeyFile       locationEnum = "keyFile"
+	locHTTPSCertFile locationEnum = "httpsCertFile"
+	locHTTPSKeyFile  locationEnum = "httpsKeyFile"
+	locDatabase      locationEnum = "database"
+	locLogFile       locationEnum = "logFile"
+	locCsrfTokens    locationEnum = "csrfTokens"
+	locPanicLog      locationEnum = "panicLog"
+	locAuditLog      locationEnum = "auditLog"
+	locGUIAssets     locationEnum = "GUIAssets"
+	locDefFolder     locationEnum = "defFolder"
 )
 
 // Platform dependent directories

cmd/syncthing/usage_report.go

@@ -190,7 +190,7 @@ func reportData(cfg configIntf, m modelIntf, connectionsService connectionsIntf,
 	res["upgradeAllowedPre"] = !(upgrade.DisabledByCompilation || noUpgradeFromEnv) && opts.AutoUpgradeIntervalH > 0 && opts.UpgradeToPreReleases
 
 	if version >= 3 {
-		res["uptime"] = int(time.Now().Sub(startTime).Seconds())
+		res["uptime"] = int(time.Since(startTime).Seconds())
 		res["natType"] = connectionsService.NATType()
 		res["alwaysLocalNets"] = len(opts.AlwaysLocalNets) > 0
 		res["cacheIgnoredFiles"] = opts.CacheIgnoredFiles