From b5f39d23b86f9cb83c51da9fe4abb4c19c01c3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sun, 24 Mar 2019 10:11:16 +0100
Subject: all: Apply staticcheck recommendations

---
 transform/chain_test.go                             | 4 ++--
 transform/livereloadinject/livereloadinject_test.go | 4 ++--
 transform/urlreplacers/absurlreplacer.go            | 7 -------
 transform/urlreplacers/absurlreplacer_test.go       | 1 -
 4 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'transform')

diff --git a/transform/chain_test.go b/transform/chain_test.go
index e34024296..a8d59f902 100644
--- a/transform/chain_test.go
+++ b/transform/chain_test.go
@@ -58,8 +58,8 @@ func TestChaingMultipleTransformers(t *testing.T) {
 
 	expected := "Test: f4r f3r f1r f2r f1r The End."
 
-	if string(out.Bytes()) != expected {
-		t.Errorf("Expected %s got %s", expected, string(out.Bytes()))
+	if out.String() != expected {
+		t.Errorf("Expected %s got %s", expected, out.String())
 	}
 }
 
diff --git a/transform/livereloadinject/livereloadinject_test.go b/transform/livereloadinject/livereloadinject_test.go
index 0e0f708d3..1058244b4 100644
--- a/transform/livereloadinject/livereloadinject_test.go
+++ b/transform/livereloadinject/livereloadinject_test.go
@@ -35,7 +35,7 @@ func doTestLiveReloadInject(t *testing.T, bodyEndTag string) {
 	tr.Apply(out, in)
 
 	expected := fmt.Sprintf(`<script data-no-instant>document.write('<script src="/livereload.js?port=1313&mindelay=10"></' + 'script>')</script>%s`, bodyEndTag)
-	if string(out.Bytes()) != expected {
-		t.Errorf("Expected %s got %s", expected, string(out.Bytes()))
+	if out.String() != expected {
+		t.Errorf("Expected %s got %s", expected, out.String())
 	}
 }
diff --git a/transform/urlreplacers/absurlreplacer.go b/transform/urlreplacers/absurlreplacer.go
index 02083d9f5..545df914a 100644
--- a/transform/urlreplacers/absurlreplacer.go
+++ b/transform/urlreplacers/absurlreplacer.go
@@ -37,8 +37,6 @@ type absurllexer struct {
 	quotes [][]byte
 }
 
-type stateFunc func(*absurllexer) stateFunc
-
 type prefix struct {
 	disabled bool
 	b        []byte
@@ -54,11 +52,6 @@ func newPrefixState() []*prefix {
 	}
 }
 
-type absURLMatcher struct {
-	match []byte
-	quote []byte
-}
-
 func (l *absurllexer) emit() {
 	l.w.Write(l.content[l.start:l.pos])
 	l.start = l.pos
diff --git a/transform/urlreplacers/absurlreplacer_test.go b/transform/urlreplacers/absurlreplacer_test.go
index f7a5b1656..3c2dbf777 100644
--- a/transform/urlreplacers/absurlreplacer_test.go
+++ b/transform/urlreplacers/absurlreplacer_test.go
@@ -41,7 +41,6 @@ const (
 	replace1 = "No replacements."
 	replace2 = "ᚠᛇᚻ ᛒᛦᚦ ᚠᚱᚩᚠᚢᚱ\nᚠᛁᚱᚪ ᚷᛖᚻᚹᛦᛚᚳᚢᛗ"
 	replace3 = `End of file: src="/`
-	replace4 = `End of file: srcset="/`
 	replace5 = `Srcsett with no closing quote: srcset="/img/small.jpg do be do be do.`
 
 	// Issue: 816, schemaless links combined with others
-- 
cgit v1.2.3