fix: remove unused struct wrapper

Author: guerinoni

cmd/main.go

@@ -236,7 +236,7 @@ func defaultNoColor() bool {
 	// try to detect these CI environments via their environment variables.
 	// This code is based on https://github.com/jwalton/go-supportscolor
 	if value, exists := os.LookupEnv("CI"); exists {
-		var ciEnvNames = []string{
+		ciEnvNames := []string{
 			"APPVEYOR",
 			"BUILDKITE",
 			"CIRCLECI",
@@ -468,7 +468,6 @@ func startGoTest(ctx context.Context, dir string, args []string) (*proc, error)
 	log.Debugf("go test pid: %d", cmd.Process.Pid)
 
 	newSignalHandler(ctx, cmd.Process.Pid, &p)
-	p.cmd = &cancelWaiter{wrapped: p.cmd}
 	return &p, nil
 }
 
@@ -529,14 +528,3 @@ func newSignalHandler(ctx context.Context, pid int, p *proc) {
 		}
 	}()
 }
-
-// cancelWaiter wraps a waiter to cancel the context after the wrapped
-// Wait exits.
-type cancelWaiter struct {
-	wrapped waiter
-}
-
-func (w *cancelWaiter) Wait() error {
-	err := w.wrapped.Wait()
-	return err
-}

cmd/main_e2e_test.go

@@ -79,7 +79,7 @@ func TestE2E_RerunFails(t *testing.T) {
 		)
 		golden.Assert(t, out, "e2e/expected/"+expectedFilename(t.Name()))
 	}
-	var testCases = []testCase{
+	testCases := []testCase{
 		{
 			name: "reruns until success",
 			args: []string{

cmd/rerunfails_test.go

@@ -68,7 +68,7 @@ func TestGoTestRunFlagFromTestCases(t *testing.T) {
 		assert.Equal(t, actual, tc.expected)
 	}
 
-	var testCases = map[string]testCase{
+	testCases := map[string]testCase{
 		"root test case": {
 			input:    "TestOne",
 			expected: "-test.run=^TestOne$",