Abolished github.com/pkg/errors (#420)

* remove github.com/pkg/errors

* `go mod tidy`

* fix losted err wrap

Author: Taillook

bindparam.go

@@ -16,14 +16,13 @@ package runtime
 import (
 	"encoding"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/url"
 	"reflect"
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/deepmap/oapi-codegen/pkg/types"
 )
 

deepobject.go

@@ -2,16 +2,16 @@ package runtime
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-	"github.com/deepmap/oapi-codegen/pkg/types"
 	"net/url"
 	"reflect"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
+	"github.com/deepmap/oapi-codegen/pkg/types"
 )
 
 func marshalDeepObject(in interface{}, path []string) ([]string, error) {
@@ -25,7 +25,7 @@ func marshalDeepObject(in interface{}, path []string) ([]string, error) {
 			newPath := append(path, strconv.Itoa(i))
 			fields, err := marshalDeepObject(iface, newPath)
 			if err != nil {
-				return nil, errors.Wrap(err, "error traversing array")
+				return nil, fmt.Errorf("error traversing array: %w", err)
 			}
 			result = append(result, fields...)
 		}
@@ -45,7 +45,7 @@ func marshalDeepObject(in interface{}, path []string) ([]string, error) {
 			newPath := append(path, k)
 			fields, err := marshalDeepObject(t[k], newPath)
 			if err != nil {
-				return nil, errors.Wrap(err, "error traversing map")
+				return nil, fmt.Errorf("error traversing map: %w", err)
 			}
 			result = append(result, fields...)
 		}
@@ -69,16 +69,16 @@ func MarshalDeepObject(i interface{}, paramName string) (string, error) {
 	// but it's complicated, error-prone code.
 	buf, err := json.Marshal(i)
 	if err != nil {
-		return "", errors.Wrap(err, "failed to marshal input to JSON")
+		return "", fmt.Errorf("failed to marshal input to JSON: %w", err)
 	}
 	var i2 interface{}
 	err = json.Unmarshal(buf, &i2)
 	if err != nil {
-		return "", errors.Wrap(err, "failed to unmarshal JSON")
+		return "", fmt.Errorf("failed to unmarshal JSON: %w", err)
 	}
 	fields, err := marshalDeepObject(i2, nil)
 	if err != nil {
-		return "", errors.Wrap(err, "error traversing JSON structure")
+		return "", fmt.Errorf("error traversing JSON structure: %w", err)
 	}
 
 	// Prefix the param name to each subscripted field.
@@ -152,7 +152,7 @@ func UnmarshalDeepObject(dst interface{}, paramName string, params url.Values) e
 	fieldPaths := makeFieldOrValue(paths, fieldValues)
 	err := assignPathValues(dst, fieldPaths)
 	if err != nil {
-		return errors.Wrap(err, "error assigning value to destination")
+		return fmt.Errorf("error assigning value to destination: %w", err)
 	}
 
 	return nil
@@ -205,7 +205,7 @@ func assignPathValues(dst interface{}, pathValues fieldOrValue) error {
 		dstSlice := reflect.MakeSlice(it, sliceLength, sliceLength)
 		err := assignSlice(dstSlice, pathValues)
 		if err != nil {
-			return errors.Wrap(err, "error assigning slice")
+			return fmt.Errorf("error assigning slice: %w", err)
 		}
 		iv.Set(dstSlice)
 		return nil
@@ -225,7 +225,7 @@ func assignPathValues(dst interface{}, pathValues fieldOrValue) error {
 			var err error
 			date.Time, err = time.Parse(types.DateFormat, pathValues.value)
 			if err != nil {
-				return errors.Wrap(err, "invalid date format")
+				return fmt.Errorf("invalid date format: %w", err)
 			}
 			dst := iv
 			if it != reflect.TypeOf(types.Date{}) {
@@ -246,7 +246,7 @@ func assignPathValues(dst interface{}, pathValues fieldOrValue) error {
 				if err != nil {
 					return fmt.Errorf("error parsing tim as RFC3339 or 2006-01-02 time: %s", err)
 				}
-				return errors.Wrap(err, "invalid date format")
+				return fmt.Errorf("invalid date format: %w", err)
 			}
 			dst := iv
 			if it != reflect.TypeOf(time.Time{}) {
@@ -259,7 +259,7 @@ func assignPathValues(dst interface{}, pathValues fieldOrValue) error {
 		}
 		fieldMap, err := fieldIndicesByJsonTag(iv.Interface())
 		if err != nil {
-			return errors.Wrap(err, "failed enumerating fields")
+			return fmt.Errorf("failed enumerating fields: %w", err)
 		}
 		for _, fieldName := range sortedFieldOrValueKeys(pathValues.fields) {
 			fieldValue := pathValues.fields[fieldName]
@@ -270,7 +270,7 @@ func assignPathValues(dst interface{}, pathValues fieldOrValue) error {
 			field := iv.Field(fieldIndex)
 			err = assignPathValues(field.Addr().Interface(), fieldValue)
 			if err != nil {
-				return errors.Wrapf(err, "error assigning field [%s]", fieldName)
+				return fmt.Errorf("error assigning field [%s]: %w", fieldName, err)
 			}
 		}
 		return nil
@@ -340,7 +340,7 @@ func assignSlice(dst reflect.Value, pathValues fieldOrValue) error {
 		dstElem := dst.Index(i).Addr()
 		err := assignPathValues(dstElem.Interface(), fieldOrValue{value: values[i]})
 		if err != nil {
-			return errors.Wrap(err, "error binding array")
+			return fmt.Errorf("error binding array: %w", err)
 		}
 	}
 

styleparam.go

@@ -14,6 +14,7 @@
 package runtime
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"reflect"
@@ -22,8 +23,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/deepmap/oapi-codegen/pkg/types"
 )
 
@@ -185,7 +184,7 @@ func styleStruct(style string, explode bool, paramName string, paramLocation Par
 	if timeVal, ok := marshalDateTimeValue(value); ok {
 		styledVal, err := stylePrimitive(style, explode, paramName, paramLocation, timeVal)
 		if err != nil {
-			return "", errors.Wrap(err, "failed to style time")
+			return "", fmt.Errorf("failed to style time: %w", err)
 		}
 		return styledVal, nil
 	}