m/pkg/combinectx: reformat
Seems like this slipped past the cracks on original review - we should
add CI for this.
Change-Id: I35cc1d14710109d4d2d0a60b573400b65cb7d350
Reviewed-on: https://review.monogon.dev/c/monogon/+/212
Reviewed-by: Mateusz Zalega <mateusz@monogon.tech>
diff --git a/metropolis/pkg/combinectx/combinectx.go b/metropolis/pkg/combinectx/combinectx.go
index 5df4ff0..3ff1d72 100644
--- a/metropolis/pkg/combinectx/combinectx.go
+++ b/metropolis/pkg/combinectx/combinectx.go
@@ -18,8 +18,8 @@
// parent contexts is Done().
func Combine(a, b context.Context) context.Context {
c := &Combined{
- a: a,
- b: b,
+ a: a,
+ b: b,
doneC: make(chan struct{}),
}
go c.run()
@@ -180,5 +180,3 @@
}
return nil
}
-
-
diff --git a/metropolis/pkg/combinectx/combinectx_test.go b/metropolis/pkg/combinectx/combinectx_test.go
index b7f2625..04efb2c 100644
--- a/metropolis/pkg/combinectx/combinectx_test.go
+++ b/metropolis/pkg/combinectx/combinectx_test.go
@@ -103,4 +103,3 @@
t.Errorf("ctx.Err().Unwrap() should be %v, got %v", want, got)
}
}
-
diff --git a/metropolis/pkg/combinectx/example_test.go b/metropolis/pkg/combinectx/example_test.go
index a6bb3aa..f0cd70f 100644
--- a/metropolis/pkg/combinectx/example_test.go
+++ b/metropolis/pkg/combinectx/example_test.go
@@ -16,7 +16,7 @@
// some long-term local worker context, while the second is a context from some
// incoming request.
ctxA, cancelA := context.WithCancel(context.Background())
- ctxB, cancelB := context.WithTimeout(context.Background(), time.Millisecond * 100)
+ ctxB, cancelB := context.WithTimeout(context.Background(), time.Millisecond*100)
defer cancelA()
defer cancelB()