json: partial lint fixes

Author: extemporalgenome

json/decode.go

@@ -1406,7 +1406,7 @@ func (d decoder) decodeMaybeEmptyInterface(b []byte, p unsafe.Pointer, t reflect
 	return d.decodeUnmarshalTypeError(b, p, t)
 }
 
-func (d decoder) decodeUnmarshalTypeError(b []byte, p unsafe.Pointer, t reflect.Type) ([]byte, error) {
+func (d decoder) decodeUnmarshalTypeError(b []byte, _ unsafe.Pointer, t reflect.Type) ([]byte, error) {
 	v, b, _, err := d.parseValue(b)
 	if err != nil {
 		return b, err
@@ -1496,7 +1496,7 @@ func (d decoder) decodeTextUnmarshaler(b []byte, p unsafe.Pointer, t reflect.Typ
 		value = "array"
 	}
 
-	return b, &UnmarshalTypeError{Value: value, Type: reflect.PtrTo(t)}
+	return b, &UnmarshalTypeError{Value: value, Type: reflect.PointerTo(t)}
 }
 
 func (d decoder) prependField(key, field string) string {

json/json.go

@@ -15,7 +15,7 @@ import (
 type Delim = json.Delim
 
 // InvalidUTF8Error is documented at https://golang.org/pkg/encoding/json/#InvalidUTF8Error
-type InvalidUTF8Error = json.InvalidUTF8Error
+type InvalidUTF8Error = json.InvalidUTF8Error //nolint:staticcheck // compat.
 
 // InvalidUnmarshalError is documented at https://golang.org/pkg/encoding/json/#InvalidUnmarshalError
 type InvalidUnmarshalError = json.InvalidUnmarshalError
@@ -39,7 +39,7 @@ type SyntaxError = json.SyntaxError
 type Token = json.Token
 
 // UnmarshalFieldError is documented at https://golang.org/pkg/encoding/json/#UnmarshalFieldError
-type UnmarshalFieldError = json.UnmarshalFieldError
+type UnmarshalFieldError = json.UnmarshalFieldError //nolint:staticcheck // compat.
 
 // UnmarshalTypeError is documented at https://golang.org/pkg/encoding/json/#UnmarshalTypeError
 type UnmarshalTypeError = json.UnmarshalTypeError

json/json_test.go

@@ -240,7 +240,7 @@ var testValues = [...]any{
 		A string         `json:"name"`
 		B string         `json:"-"`
 		C string         `json:",omitempty"`
-		D map[string]any `json:",string"`
+		D map[string]any `json:",string"` //nolint:staticcheck // intentional
 		e string
 	}{A: "Luke", D: map[string]any{"answer": float64(42)}},
 	struct{ point }{point{1, 2}},
@@ -880,12 +880,11 @@ func TestDecodeLines(t *testing.T) {
 		t.Run(test.desc, func(t *testing.T) {
 			d := NewDecoder(test.reader)
 			var count int
-			var err error
 			for {
 				var o obj
-				err = d.Decode(&o)
+				err := d.Decode(&o)
 				if err != nil {
-					if err == io.EOF {
+					if errors.Is(err, io.EOF) {
 						break
 					}
 
@@ -904,10 +903,6 @@ func TestDecodeLines(t *testing.T) {
 				count++
 			}
 
-			if err != nil && err != io.EOF {
-				t.Error(err)
-			}
-
 			if count != test.expectCount {
 				t.Errorf("expected %d objects, got %d", test.expectCount, count)
 			}