Run gofumpt -w which removes naked returns for clarity

Author: mstoykov

cloudapi/logs.go

@@ -244,5 +244,5 @@ func retry(s sleeper, attempts int, interval, maxDuration time.Duration, do func
 			return nil
 		}
 	}
-	return
+	return err
 }

cloudapi/logs_test.go

@@ -223,7 +223,7 @@ func TestStreamLogsToLogger(t *testing.T) {
 		for _, e := range hook.Drain() {
 			lines = append(lines, e.Message)
 		}
-		return
+		return lines
 	}
 
 	generateLogline := func(key string, ts uint64, msg string) string {
@@ -276,7 +276,7 @@ func TestStreamLogsToLogger(t *testing.T) {
 			}
 
 			start = time.Unix(0, rawstart)
-			return
+			return start, err
 		}
 
 		var requestsCount uint64
@@ -355,7 +355,7 @@ func TestStreamLogsToLogger(t *testing.T) {
 			}
 
 			start = time.Unix(0, rawstart)
-			return
+			return start, err
 		}
 
 		var requestsCount uint64

ext/ext.go

@@ -136,12 +136,12 @@ func extractModuleInfo(mod interface{}) (path, version string) {
 	case reflect.Func:
 		path = runtime.FuncForPC(reflect.ValueOf(mod).Pointer()).Name()
 	default:
-		return
+		return path, version
 	}
 
 	buildInfo, ok := debug.ReadBuildInfo()
 	if !ok {
-		return
+		return path, version
 	}
 
 	for _, dep := range buildInfo.Deps {
@@ -154,7 +154,7 @@ func extractModuleInfo(mod interface{}) (path, version string) {
 		}
 	}
 
-	return
+	return path, version
 }
 
 func init() {

internal/js/eventloop/eventloop.go

@@ -149,7 +149,7 @@ func (e *EventLoop) popAll() (queue []func() error, awaiting bool) {
 	e.queue = make([]func() error, 0, len(queue))
 	awaiting = e.registeredCallbacks != 0
 	e.lock.Unlock()
-	return
+	return queue, awaiting
 }
 
 func (e *EventLoop) putInfront(queue []func() error) {

internal/js/modules/k6/browser/common/connection.go

@@ -658,5 +658,5 @@ func (c *Connection) isClosing() (s bool) {
 	default:
 	}
 
-	return
+	return s
 }

internal/lib/summary/summary.go

@@ -97,7 +97,7 @@ func ValidateMode(val string) (m Mode, err error) {
 	if err = m.UnmarshalText([]byte(val)); err != nil {
 		return 0, err
 	}
-	return
+	return m, err
 }
 
 // Summary is the data structure that holds all the summary data (thresholds, metrics, checks, etc)

internal/lib/testutils/minirunner/minirunner.go

@@ -64,7 +64,7 @@ func (r *MiniRunner) Setup(ctx context.Context, out chan<- metrics.SampleContain
 	if fn := r.SetupFn; fn != nil {
 		r.SetupData, err = fn(ctx, out)
 	}
-	return
+	return err
 }
 
 // GetSetupData returns json representation of the setup data if setup() is

internal/output/summary/data.go

@@ -441,7 +441,7 @@ func extractPercentileThresholdSource(source string) (agg string, percentile flo
 
 		agg = "p(" + matches[1] + ")"
 		isPercentile = true
-		return
+		return agg, percentile, isPercentile
 	}
 
 	return "", 0, false

lib/executor/helpers.go

@@ -26,7 +26,7 @@ func sumStagesDuration(stages []Stage) (result time.Duration) {
 	for _, s := range stages {
 		result += s.Duration.TimeDuration()
 	}
-	return
+	return result
 }
 
 func getStagesUnscaledMaxTarget(unscaledStartValue int64, stages []Stage) int64 {

lib/netext/resolver.go

@@ -154,7 +154,7 @@ func (r *resolver) applyPolicy(ips []net.IP) (retIPs []net.IP) {
 		retIPs = ips
 	}
 
-	return
+	return retIPs
 }
 
 func groupByVersion(ips []net.IP) (ip4 []net.IP, ip6 []net.IP) {
@@ -166,5 +166,5 @@ func groupByVersion(ips []net.IP) (ip4 []net.IP, ip6 []net.IP) {
 		}
 	}
 
-	return
+	return ip4, ip6
 }