From ccd46404c077f34cf1821b5d6a64c643f22bcd06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 28 Jun 2020 16:32:01 +0100
Subject: [PATCH] improve binsubstr error messages a bit

By printing all the strings that failed at once, not just the first.
---
 main_test.go | 13 +++++++++----
 strings.go   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/main_test.go b/main_test.go
index 97ae9bd..4d2539a 100644
--- a/main_test.go
+++ b/main_test.go
@@ -85,14 +85,20 @@ func binsubstr(ts *testscript.TestScript, neg bool, args []string) {
 		ts.Fatalf("usage: binsubstr file substr...")
 	}
 	data := ts.ReadFile(args[0])
+	var failed []string
 	for _, substr := range args[1:] {
 		match := strings.Contains(data, substr)
 		if match && neg {
-			ts.Fatalf("unexpected match for %q in %s", substr, args[0])
+			failed = append(failed, substr)
 		} else if !match && !neg {
-			ts.Fatalf("expected match for %q in %s", substr, args[0])
+			failed = append(failed, substr)
 		}
 	}
+	if len(failed) > 0 && neg {
+		ts.Fatalf("unexpected match for %q in %s", failed, args[0])
+	} else if len(failed) > 0 {
+		ts.Fatalf("expected match for %q in %s", failed, args[0])
+	}
 }
 
 func bincmp(ts *testscript.TestScript, neg bool, args []string) {
@@ -103,8 +109,7 @@ func bincmp(ts *testscript.TestScript, neg bool, args []string) {
 	data2 := ts.ReadFile(args[1])
 	if neg {
 		if data1 == data2 {
-			ts.Fatalf("%s and %s don't differ",
-				args[0], args[1])
+			ts.Fatalf("%s and %s don't differ", args[0], args[1])
 		}
 		return
 	}
diff --git a/strings.go b/strings.go
index b4dbc97..9c33fc4 100644
--- a/strings.go
+++ b/strings.go
@@ -22,7 +22,7 @@ func isTypeDefStr(typ types.Type) bool {
 
 func containsTypeDefStr(expr ast.Expr, info *types.Info) bool {
 	typ := info.TypeOf(expr)
-	//log.Println(expr, typ, reflect.TypeOf(expr), reflect.TypeOf(typ))
+	// log.Println(expr, typ, reflect.TypeOf(expr), reflect.TypeOf(typ))
 
 	if sig, ok := typ.(*types.Signature); ok {
 		for i := 0; i < sig.Params().Len(); i++ {