commit fd722bea7e1ff2b4af58ac4063e2b8435e7bb6e5
author Markus Zimmermann <markus.zimmermann@nethead.at> Wed Sep 28 19:15:14 2016 +0200
committer Markus Zimmermann <markus.zimmermann@nethead.at> Thu Oct 06 11:12:09 2016 +0200
tree 92bbb23e0f00d0b040dcafe6c231a14903617896
parent 0b2d30b9b21bab17a00de2a2eb4699fddd858b2d

Make errcheck happy

The bytes.Buffer.WriteString has the superb property of "err is always
nil", so we can just ignore it. However, we explicitly ignore it so that
we can use errcheck without ignoring everything.

diffmatchpatch/dmp.go

diff --git a/diffmatchpatch/dmp.go b/diffmatchpatch/dmp.go
index 69cef0a..7ac5630 100644
--- a/diffmatchpatch/dmp.go
+++ b/diffmatchpatch/dmp.go
@@ -187,21 +187,21 @@
 	}
 
 	var text bytes.Buffer
-	text.WriteString("@@ -" + coords1 + " +" + coords2 + " @@\n")
+	_, _ = text.WriteString("@@ -" + coords1 + " +" + coords2 + " @@\n")
 
 	// Escape the body of the patch with %xx notation.
 	for _, aDiff := range p.diffs {
 		switch aDiff.Type {
 		case DiffInsert:
-			text.WriteString("+")
+			_, _ = text.WriteString("+")
 		case DiffDelete:
-			text.WriteString("-")
+			_, _ = text.WriteString("-")
 		case DiffEqual:
-			text.WriteString(" ")
+			_, _ = text.WriteString(" ")
 		}
 
-		text.WriteString(strings.Replace(url.QueryEscape(aDiff.Text), "+", " ", -1))
-		text.WriteString("\n")
+		_, _ = text.WriteString(strings.Replace(url.QueryEscape(aDiff.Text), "+", " ", -1))
+		_, _ = text.WriteString("\n")
 	}
 
 	return unescaper.Replace(text.String())
@@ -1395,17 +1395,17 @@
 		text := strings.Replace(html.EscapeString(diff.Text), "\n", "&para;<br>", -1)
 		switch diff.Type {
 		case DiffInsert:
-			buff.WriteString("<ins style=\"background:#e6ffe6;\">")
-			buff.WriteString(text)
-			buff.WriteString("</ins>")
+			_, _ = buff.WriteString("<ins style=\"background:#e6ffe6;\">")
+			_, _ = buff.WriteString(text)
+			_, _ = buff.WriteString("</ins>")
 		case DiffDelete:
-			buff.WriteString("<del style=\"background:#ffe6e6;\">")
-			buff.WriteString(text)
-			buff.WriteString("</del>")
+			_, _ = buff.WriteString("<del style=\"background:#ffe6e6;\">")
+			_, _ = buff.WriteString(text)
+			_, _ = buff.WriteString("</del>")
 		case DiffEqual:
-			buff.WriteString("<span>")
-			buff.WriteString(text)
-			buff.WriteString("</span>")
+			_, _ = buff.WriteString("<span>")
+			_, _ = buff.WriteString(text)
+			_, _ = buff.WriteString("</span>")
 		}
 	}
 	return buff.String()
@@ -1418,7 +1418,7 @@
 
 	for _, aDiff := range diffs {
 		if aDiff.Type != DiffInsert {
-			text.WriteString(aDiff.Text)
+			_, _ = text.WriteString(aDiff.Text)
 		}
 	}
 	return text.String()
@@ -1430,7 +1430,7 @@
 
 	for _, aDiff := range diffs {
 		if aDiff.Type != DiffDelete {
-			text.WriteString(aDiff.Text)
+			_, _ = text.WriteString(aDiff.Text)
 		}
 	}
 	return text.String()
@@ -1471,19 +1471,19 @@
 	for _, aDiff := range diffs {
 		switch aDiff.Type {
 		case DiffInsert:
-			text.WriteString("+")
-			text.WriteString(strings.Replace(url.QueryEscape(aDiff.Text), "+", " ", -1))
-			text.WriteString("\t")
+			_, _ = text.WriteString("+")
+			_, _ = text.WriteString(strings.Replace(url.QueryEscape(aDiff.Text), "+", " ", -1))
+			_, _ = text.WriteString("\t")
 			break
 		case DiffDelete:
-			text.WriteString("-")
-			text.WriteString(strconv.Itoa(utf8.RuneCountInString(aDiff.Text)))
-			text.WriteString("\t")
+			_, _ = text.WriteString("-")
+			_, _ = text.WriteString(strconv.Itoa(utf8.RuneCountInString(aDiff.Text)))
+			_, _ = text.WriteString("\t")
 			break
 		case DiffEqual:
-			text.WriteString("=")
-			text.WriteString(strconv.Itoa(utf8.RuneCountInString(aDiff.Text)))
-			text.WriteString("\t")
+			_, _ = text.WriteString("=")
+			_, _ = text.WriteString(strconv.Itoa(utf8.RuneCountInString(aDiff.Text)))
+			_, _ = text.WriteString("\t")
 			break
 		}
 	}
@@ -2128,7 +2128,7 @@
 func (dmp *DiffMatchPatch) PatchToText(patches []Patch) string {
 	var text bytes.Buffer
 	for _, aPatch := range patches {
-		text.WriteString(aPatch.String())
+		_, _ = text.WriteString(aPatch.String())
 	}
 	return text.String()
 }

diffmatchpatch/dmp_test.go

diff --git a/diffmatchpatch/dmp_test.go b/diffmatchpatch/dmp_test.go
index 45a8bca..630bdf7 100644
--- a/diffmatchpatch/dmp_test.go
+++ b/diffmatchpatch/dmp_test.go
@@ -25,18 +25,18 @@
 func pretty(diffs []Diff) string {
 	var w bytes.Buffer
 	for i, diff := range diffs {
-		w.WriteString(fmt.Sprintf("%v. ", i))
+		_, _ = w.WriteString(fmt.Sprintf("%v. ", i))
 		switch diff.Type {
 		case DiffInsert:
-			w.WriteString("DiffIns")
+			_, _ = w.WriteString("DiffIns")
 		case DiffDelete:
-			w.WriteString("DiffDel")
+			_, _ = w.WriteString("DiffDel")
 		case DiffEqual:
-			w.WriteString("DiffEql")
+			_, _ = w.WriteString("DiffEql")
 		default:
-			w.WriteString("Unknown")
+			_, _ = w.WriteString("Unknown")
 		}
-		w.WriteString(fmt.Sprintf(": %v\n", diff.Text))
+		_, _ = w.WriteString(fmt.Sprintf(": %v\n", diff.Text))
 	}
 	return w.String()
 }