all: remove refs to deprecated xerrors

google · Jun 14, 2023 · 2e4fad4 · 2e4fad4
1 parent 1db413f
commit 2e4fad4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/gcerrors/errors.go b/gcerrors/errors.go
@@ -18,9 +18,9 @@ package gcerrors
 
 import (
 	"context"
+	"errors"
 
 	"gocloud.dev/internal/gcerr"
-	"golang.org/x/xerrors"
 )
 
 // An ErrorCode describes the error's category. Programs should act upon an error's
@@ -78,13 +78,13 @@ func Code(err error) ErrorCode {
 		return OK
 	}
 	var e *gcerr.Error
-	if xerrors.As(err, &e) {
+	if errors.As(err, &e) {
 		return e.Code
 	}
-	if xerrors.Is(err, context.Canceled) {
+	if errors.Is(err, context.Canceled) {
 		return Canceled
 	}
-	if xerrors.Is(err, context.DeadlineExceeded) {
+	if errors.Is(err, context.DeadlineExceeded) {
 		return DeadlineExceeded
 	}
 	return Unknown

diff --git a/internal/gcerr/gcerr.go b/internal/gcerr/gcerr.go
@@ -17,6 +17,7 @@ package gcerr
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"reflect"
@@ -140,17 +141,17 @@ func Newf(c ErrorCode, err error, format string, args ...interface{}) *Error {
 // It returns true if err is a retry error, a context error, io.EOF, or if it wraps
 // one of those.
 func DoNotWrap(err error) bool {
-	if xerrors.Is(err, io.EOF) {
+	if errors.Is(err, io.EOF) {
 		return true
 	}
-	if xerrors.Is(err, context.Canceled) {
+	if errors.Is(err, context.Canceled) {
 		return true
 	}
-	if xerrors.Is(err, context.DeadlineExceeded) {
+	if errors.Is(err, context.DeadlineExceeded) {
 		return true
 	}
 	var r *retry.ContextError
-	return xerrors.As(err, &r)
+	return errors.As(err, &r)
 }
 
 // GRPCCode extracts the gRPC status code and converts it into an ErrorCode.

diff --git a/internal/retry/retry_test.go b/internal/retry/retry_test.go
@@ -22,7 +22,6 @@ import (
 	"time"
 
 	"github.com/googleapis/gax-go/v2"
-	"golang.org/x/xerrors"
 )
 
 // Errors to distinguish retryable and non-retryable cases.
@@ -138,7 +137,7 @@ func TestErrorsIs(t *testing.T) {
 		FuncErr: os.ErrExist,
 	}
 	for _, target := range []error{err, context.Canceled, os.ErrExist} {
-		if !xerrors.Is(err, target) {
+		if !errors.Is(err, target) {
 			t.Errorf("xerrors.Is(%v) == false, want true", target)
 		}
 	}

diff --git a/pubsub/acks_test.go b/pubsub/acks_test.go
@@ -21,8 +21,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/xerrors"
-
 	"gocloud.dev/gcerrors"
 	"gocloud.dev/internal/gcerr"
 	"gocloud.dev/pubsub"
@@ -435,7 +433,7 @@ func TestReceiveReturnsAckErrorOnNoMoreMessages(t *testing.T) {
 	if got := gcerrors.Code(err); got != gcerrors.Internal {
 		t.Fatalf("error code = %v; want %v", got, gcerrors.Internal)
 	}
-	if got := xerrors.Unwrap(err); got != serr {
+	if got := errors.Unwrap(err); got != serr {
 		t.Errorf("error = %v; want %v", got, serr)
 	}
 }
diff --git a/pubsub/benchmark_test.go b/pubsub/benchmark_test.go
@@ -16,6 +16,7 @@ package pubsub
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/rand"
 	"sync"
@@ -24,7 +25,6 @@ import (
 
 	"gocloud.dev/pubsub/driver"
 	"golang.org/x/sync/errgroup"
-	"golang.org/x/xerrors"
 )
 
 const (
@@ -281,7 +281,7 @@ func runBenchmark(t *testing.T, description string, numGoRoutines int, receivePr
 			// Each goroutine loops until ctx is canceled.
 			for {
 				m, err := sub.Receive(ctx)
-				if xerrors.Is(err, context.DeadlineExceeded) {
+				if errors.Is(err, context.DeadlineExceeded) {
 					return nil
 				}
 				if err != nil {