From e60feffe81351ec137a51b926ec6867ed20fcbe2 Mon Sep 17 00:00:00 2001
From: JBD <jbd@golang.org>
Date: Sun, 7 Jun 2020 18:31:03 -0700
Subject: [PATCH] Fix the colors broken by #23

---
 main.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/main.go b/main.go
index e69d76b..18a5bef 100644
--- a/main.go
+++ b/main.go
@@ -22,9 +22,9 @@ import (
 )
 
 var (
-	pass = color.New(color.FgGreen)
-	skip = color.New(color.FgYellow)
-	fail = color.New(color.FgHiRed)
+	pass = color.FgGreen
+	skip = color.FgYellow
+	fail = color.FgHiRed
 )
 
 const paletteEnv = "GOTEST_PALETTE"
@@ -94,17 +94,16 @@ func consume(wg *sync.WaitGroup, r io.Reader) {
 	}
 }
 
-var c *color.Color
-
 func parse(line string) {
 	trimmed := strings.TrimSpace(line)
 	defer color.Unset()
 
+	var c color.Attribute
 	switch {
 	case strings.HasPrefix(trimmed, "=== RUN"):
 		fallthrough
 	case strings.HasPrefix(trimmed, "?"):
-		c = nil
+		color.Unset()
 
 	// passed
 	case strings.HasPrefix(trimmed, "--- PASS"):
@@ -125,6 +124,7 @@ func parse(line string) {
 		c = fail
 	}
 
+	color.Set(c)
 	fmt.Printf("%s\n", line)
 }
 
@@ -154,10 +154,10 @@ func setPalette() {
 		return
 	}
 	if c, ok := colors[vals[0]]; ok {
-		fail = color.Set(c)
+		fail = c
 	}
 	if c, ok := colors[vals[1]]; ok {
-		pass = color.New(c)
+		pass = c
 	}
 }