Get the linter passing (even if it means ignoring borrowed files)

7 files changed, 14 insertions, 16 deletions

diff --git a/.golangci.yml b/.golangci.yml
index efd6d2c..0a0eb7e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,3 +10,6 @@ linters:
 linters-settings:
   gofmt:
     simplify: true
+run:
+  skip-files:
+    - '^(.*/)?borrowed_.*_test\.go$' # TODO
diff --git a/compat/json/compat.go b/compat/json/compat.go
index 42dd807..802d4ef 100644
--- a/compat/json/compat.go
+++ b/compat/json/compat.go
@@ -21,16 +21,14 @@ type (
 	RawMessage = json.RawMessage
 
 	// low-level decode errors
-	//SyntaxError         = lowmemjson.DecodeSyntaxError // expose a field
-	UnmarshalFieldError = json.UnmarshalFieldError
-	UnmarshalTypeError  = json.UnmarshalTypeError // lowmemjson.DecodeTypeError
+	//SyntaxError        = json.SyntaxError // duplicated to access a private field
+	UnmarshalTypeError = json.UnmarshalTypeError
 
 	// high-level decode errors
-	InvalidUnmarshalError = json.InvalidUnmarshalError // lowmemjson.DecodeArgumentError
+	InvalidUnmarshalError = json.InvalidUnmarshalError
 
 	// marshal errors
-	InvalidUTF8Error = json.InvalidUTF8Error
-	//MarshalerError        = lowmemjson.EncodeMethodError // expose a field
+	//MarshalerError        = json.MarshalerError // duplicated to access a private field
 	UnsupportedTypeError  = json.UnsupportedTypeError
 	UnsupportedValueError = json.UnsupportedValueError
 )
diff --git a/decode.go b/decode.go
index 1e90bb1..51402e7 100644
--- a/decode.go
+++ b/decode.go
@@ -71,7 +71,7 @@ func (dec *Decoder) InputOffset() int64     { return dec.io.InputOffset() }
 func (dec *Decoder) More() bool {
 	dec.io.Reset()
 	_, _, t, e := dec.io.ReadRuneType()
-	dec.io.UnreadRune()
+	_ = dec.io.UnreadRune() // best effort
 	return e == nil && t != RuneTypeEOF
 }
 
@@ -278,7 +278,6 @@ var (
 	decodableType       = reflect.TypeOf((*Decodable)(nil)).Elem()
 	jsonUnmarshalerType = reflect.TypeOf((*json.Unmarshaler)(nil)).Elem()
 	textUnmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
-	boolType            = reflect.TypeOf(true)
 	float64Type         = reflect.TypeOf(float64(0))
 )
 
@@ -553,7 +552,7 @@ func (dec *Decoder) decode(val reflect.Value, nullOK bool) {
 							}
 							nameValPtr.Elem().SetUint(n)
 						default:
-							dec.panicType("object", typ, &DecodeArgumentError{nameValTyp})
+							dec.panicType("object", typ, &DecodeArgumentError{Type: nameValTyp})
 						}
 					}
 					dec.stackPush(typ, nameValPtr.Elem())
diff --git a/decode_scan.go b/decode_scan.go
index 2830d0b..fb8a6ec 100644
--- a/decode_scan.go
+++ b/decode_scan.go
@@ -64,7 +64,7 @@ func (sc *runeTypeScannerImpl) Reset() {
 			sc.rErr = nil
 		}
 		// tell it to use that rType and rErr
-		sc.UnreadRune()
+		_ = sc.UnreadRune() // we set it up to always succeed
 	}
 }
 
@@ -74,7 +74,7 @@ func (sc *runeTypeScannerImpl) ReadRuneType() (rune, int, RuneType, error) {
 		// do nothing
 	case sc.repeat:
 		if _, ok := sc.inner.(io.RuneScanner); ok {
-			sc.inner.ReadRune()
+			_, _, _ = sc.inner.ReadRune()
 		}
 	default:
 		var err error
diff --git a/encode_test.go b/encode_test.go
index 06eadf7..05770c7 100644
--- a/encode_test.go
+++ b/encode_test.go
@@ -28,7 +28,7 @@ func TestEncoderIndent(t *testing.T) {
 	enc := NewEncoder(&ReEncoder{
 		Out:                 &out,
 		AllowMultipleValues: true,
-		Indent: "\t",
+		Indent:              "\t",
 	})
 
 	assert.NoError(t, enc.Encode(1))
diff --git a/reencode.go b/reencode.go
index 46a8e48..e781c03 100644
--- a/reencode.go
+++ b/reencode.go
@@ -11,8 +11,6 @@ import (
 	"unicode/utf8"
 )
 
-type reencodeState func(rune) error
-
 type speculation struct {
 	compactFmt ReEncoder
 	compactBuf bytes.Buffer
diff --git a/reencode_test.go b/reencode_test.go
index 5fe66db..8886432 100644
--- a/reencode_test.go
+++ b/reencode_test.go
@@ -21,8 +21,8 @@ func TestReEncodeCompactIfUnder(t *testing.T) {
 	})
 
 	obj := map[string][]string{
-		"a": []string{"b", "c"},
-		"d": []string{"eeeeeeeeeeeeeee"},
+		"a": {"b", "c"},
+		"d": {"eeeeeeeeeeeeeee"},
 	}
 
 	assert.NoError(t, enc.Encode(obj))