Additional cleanup with Go 1.13 as minimal version

google · Apr 26, 2022 · af174ab · af174ab
1 parent 63c2960
commit af174ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/cmp/cmpopts/equate.go b/cmp/cmpopts/equate.go
@@ -6,6 +6,7 @@
 package cmpopts
 
 import (
+	"errors"
 	"math"
 	"reflect"
 	"time"
@@ -136,6 +137,12 @@ func EquateErrors() cmp.Option {
 	return cmp.FilterValues(areConcreteErrors, cmp.Comparer(compareErrors))
 }
 
+func compareErrors(x, y interface{}) bool {
+	xe := x.(error)
+	ye := y.(error)
+	return errors.Is(xe, ye) || errors.Is(ye, xe)
+}
+
 // areConcreteErrors reports whether x and y are types that implement error.
 // The input types are deliberately of the interface{} type rather than the
 // error type so that we can handle situations where the current type is an

diff --git a/cmp/cmpopts/errors_go113.go b/cmp/cmpopts/errors_go113.go
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module github.com/google/go-cmp
 
-go 1.11
+go 1.13