From 16a9c7033f22467d0dda7ae64aec9fcaeaa92570 Mon Sep 17 00:00:00 2001 From: gezimbll Date: Thu, 26 Oct 2023 05:24:04 -0400 Subject: [PATCH] Remove unreachable err cases from HandleJSONErr json.UnmarshalError happens only when we pass a non-nil pointer, which is not the case for us. Usage of go vet helps us make sure it also won't be happening in the future. --- config/rjreader.go | 4 ---- config/rjreader_test.go | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/config/rjreader.go b/config/rjreader.go index 29971c4bd..7fcd88ffe 100644 --- a/config/rjreader.go +++ b/config/rjreader.go @@ -270,10 +270,6 @@ func (rjr *RjReader) HandleJSONError(err error) error { switch realErr := err.(type) { case nil: return nil - case *json.InvalidUTF8Error, *json.UnmarshalFieldError: // deprecated - return err - case *json.InvalidUnmarshalError: // e.g. nil parameter - return err case *json.SyntaxError: offset = realErr.Offset case *json.UnmarshalTypeError: diff --git a/config/rjreader_test.go b/config/rjreader_test.go index 76008b63e..556902748 100644 --- a/config/rjreader_test.go +++ b/config/rjreader_test.go @@ -312,19 +312,6 @@ func TestHandleJSONErrorInvalidUTF8(t *testing.T) { } } -func TestHandleJSONErrorInvalidUnmarshalError(t *testing.T) { - rjr := NewRjReaderFromBytes([]byte("{}")) - err := json.NewDecoder(rjr).Decode(nil) - if err == nil { - t.Fatal(err) - } - err = rjr.HandleJSONError(err) - expectedErr := &json.InvalidUnmarshalError{Type: reflect.TypeOf(nil)} - if err == nil || err.Error() != expectedErr.Error() { - t.Errorf("Expected %+v, received %+v", expectedErr, err) - } -} - func TestHandleJSONErrorDefaultError(t *testing.T) { rjr := NewRjReaderFromBytes([]byte("{}")) rjr.indx = 10