all: simplify some statements

shuLhan · Sep 13, 2024 · 701f1d9 · 701f1d9
1 parent 5c85fd9
commit 701f1d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/cmd/ansua/main.go b/cmd/ansua/main.go
@@ -140,7 +140,7 @@ func getExecArg() (execArgs string) {
 }
 
 func onStopped(cause string, orgDur time.Duration, timeStart time.Time) {
-	var dur = orgDur - time.Now().Sub(timeStart).Round(time.Second)
+	var dur = orgDur - time.Since(timeStart).Round(time.Second)
 	fmt.Printf("%s remaining duration is %s.\n", cause, dur)
 }
 

diff --git a/lib/dns/rdata_svcb.go b/lib/dns/rdata_svcb.go
@@ -704,9 +704,7 @@ func (svcb *RDataSVCB) unpackParamPort(packet []byte) ([]byte, error) {
 	}
 	packet = packet[2:]
 
-	var portv string
-
-	portv = strconv.FormatUint(uint64(u16), 10)
+	var portv = strconv.FormatUint(uint64(u16), 10)
 	svcb.Params[svcbKeyIDPort] = []string{portv}
 
 	return packet, nil

diff --git a/lib/sshconfig/config.go b/lib/sshconfig/config.go
@@ -88,10 +88,7 @@ func Load(file string) (cfg *Config, err error) {
 
 	cfg.loadEnvironments()
 
-	var p *parser
-
-	p = newParser(cfg)
-
+	var p = newParser(cfg)
 	var lines []string
 
 	lines, err = p.load("", file)

diff --git a/lib/telemetry/internal/cmd/agent-example/main.go b/lib/telemetry/internal/cmd/agent-example/main.go
@@ -52,19 +52,13 @@ func main() {
 }
 
 func createGoMetricsCollector() (col *telemetry.GoMetricsCollector) {
-	var (
-		metricsFilter *regexp.Regexp
-	)
-	metricsFilter = regexp.MustCompile(`^go_(cpu|gc|memory|sched)_.*$`)
+	var metricsFilter = regexp.MustCompile(`^go_(cpu|gc|memory|sched)_.*$`)
 	col = telemetry.NewGoMetricsCollector(metricsFilter)
 	return col
 }
 
 func createGoMemStatsCollector() (col *telemetry.GoMemStatsCollector) {
-	var (
-		metricsFilter *regexp.Regexp
-	)
-	metricsFilter = regexp.MustCompile(`^.*$`)
+	var metricsFilter = regexp.MustCompile(`^.*$`)
 	col = telemetry.NewGoMemStatsCollector(metricsFilter)
 	return col
 }