return function return value when is only err

errors.go

@@ -12,10 +12,7 @@ import (
 // http://jsonapi.org/format/#document-top-level
 // and here: http://jsonapi.org/format/#error-objects.
 func MarshalErrors(w io.Writer, errorObjects []*ErrorObject) error {
-	if err := json.NewEncoder(w).Encode(&ErrorsPayload{Errors: errorObjects}); err != nil {
+	return json.NewEncoder(w).Encode(&ErrorsPayload{Errors: errorObjects})
-		return err
-	}
-	return nil
 }
 
 // ErrorsPayload is a serializer struct for representing a valid JSON API errors payload.

response.go

@@ -68,10 +68,7 @@ func MarshalPayload(w io.Writer, models interface{}) error {
 		return err
 	}
 
-	if err := json.NewEncoder(w).Encode(payload); err != nil {
+	return json.NewEncoder(w).Encode(payload)
-		return err
-	}
-	return nil
 }
 
 // Marshal does the same as MarshalPayload except it just returns the payload
@@ -128,10 +125,7 @@ func MarshalPayloadWithoutIncluded(w io.Writer, model interface{}) error {
 	}
 	payload.clearIncluded()
 
-	if err := json.NewEncoder(w).Encode(payload); err != nil {
+	return json.NewEncoder(w).Encode(payload)
-		return err
-	}
-	return nil
 }
 
 // marshalOne does the same as MarshalOnePayload except it just returns the
@@ -195,11 +189,7 @@ func MarshalOnePayloadEmbedded(w io.Writer, model interface{}) error {
 
 	payload := &OnePayload{Data: rootNode}
 
-	if err := json.NewEncoder(w).Encode(payload); err != nil {
+	return json.NewEncoder(w).Encode(payload)
-		return err
-	}
-
-	return nil
 }
 
 func visitModelNode(model interface{}, included *map[string]*Node,