Additional cleanup with Go 1.13 as minimal version

google · Apr 26, 2022 · 50caa72 · 50caa72
1 parent 63c2960
commit 50caa72
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"
@@ -146,3 +147,9 @@ func areConcreteErrors(x, y interface{}) bool {
 	_, ok2 := y.(error)
 	return ok1 && ok2
 }
+
+func compareErrors(x, y interface{}) bool {
+	xe := x.(error)
+	ye := y.(error)
+	return errors.Is(xe, ye) || errors.Is(ye, xe)
+}
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