2
0

Use Go 1.13 errors instead of xerrors

This commit is contained in:
Jack Christensen
2021-03-25 09:01:59 -04:00
parent aa89720576
commit dd160540c4
80 changed files with 927 additions and 956 deletions
+12 -12
View File
@@ -2,9 +2,9 @@ package pgtype
import (
"database/sql/driver"
"fmt"
"github.com/jackc/pgio"
errors "golang.org/x/xerrors"
)
type Numrange struct {
@@ -30,7 +30,7 @@ func (dst *Numrange) Set(src interface{}) error {
case string:
return dst.DecodeText(nil, []byte(value))
default:
return errors.Errorf("cannot convert %v to Numrange", src)
return fmt.Errorf("cannot convert %v to Numrange", src)
}
return nil
@@ -48,7 +48,7 @@ func (dst Numrange) Get() interface{} {
}
func (src *Numrange) AssignTo(dst interface{}) error {
return errors.Errorf("cannot assign %v to %T", src, dst)
return fmt.Errorf("cannot assign %v to %T", src, dst)
}
func (dst *Numrange) DecodeText(ci *ConnInfo, src []byte) error {
@@ -137,7 +137,7 @@ func (src Numrange) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
case Empty:
return append(buf, "empty"...), nil
default:
return nil, errors.Errorf("unknown lower bound type %v", src.LowerType)
return nil, fmt.Errorf("unknown lower bound type %v", src.LowerType)
}
var err error
@@ -147,7 +147,7 @@ func (src Numrange) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
if err != nil {
return nil, err
} else if buf == nil {
return nil, errors.Errorf("Lower cannot be null unless LowerType is Unbounded")
return nil, fmt.Errorf("Lower cannot be null unless LowerType is Unbounded")
}
}
@@ -158,7 +158,7 @@ func (src Numrange) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
if err != nil {
return nil, err
} else if buf == nil {
return nil, errors.Errorf("Upper cannot be null unless UpperType is Unbounded")
return nil, fmt.Errorf("Upper cannot be null unless UpperType is Unbounded")
}
}
@@ -168,7 +168,7 @@ func (src Numrange) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
case Inclusive:
buf = append(buf, ']')
default:
return nil, errors.Errorf("unknown upper bound type %v", src.UpperType)
return nil, fmt.Errorf("unknown upper bound type %v", src.UpperType)
}
return buf, nil
@@ -192,7 +192,7 @@ func (src Numrange) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
case Empty:
return append(buf, emptyMask), nil
default:
return nil, errors.Errorf("unknown LowerType: %v", src.LowerType)
return nil, fmt.Errorf("unknown LowerType: %v", src.LowerType)
}
switch src.UpperType {
@@ -202,7 +202,7 @@ func (src Numrange) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
rangeType |= upperUnboundedMask
case Exclusive:
default:
return nil, errors.Errorf("unknown UpperType: %v", src.UpperType)
return nil, fmt.Errorf("unknown UpperType: %v", src.UpperType)
}
buf = append(buf, rangeType)
@@ -218,7 +218,7 @@ func (src Numrange) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
return nil, err
}
if buf == nil {
return nil, errors.Errorf("Lower cannot be null unless LowerType is Unbounded")
return nil, fmt.Errorf("Lower cannot be null unless LowerType is Unbounded")
}
pgio.SetInt32(buf[sp:], int32(len(buf[sp:])-4))
@@ -233,7 +233,7 @@ func (src Numrange) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
return nil, err
}
if buf == nil {
return nil, errors.Errorf("Upper cannot be null unless UpperType is Unbounded")
return nil, fmt.Errorf("Upper cannot be null unless UpperType is Unbounded")
}
pgio.SetInt32(buf[sp:], int32(len(buf[sp:])-4))
@@ -258,7 +258,7 @@ func (dst *Numrange) Scan(src interface{}) error {
return dst.DecodeText(nil, srcCopy)
}
return errors.Errorf("cannot scan %T", src)
return fmt.Errorf("cannot scan %T", src)
}
// Value implements the database/sql/driver Valuer interface.