[ci skip] Upgrade github.com/google/go-cmp to v0.4.0

internal/rdb/inspect_test.go

@@ -10,49 +10,12 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	h "github.com/hibiken/asynq/internal/asynqtest"
 	"github.com/hibiken/asynq/internal/base"
 	"github.com/rs/xid"
 )
 
-// TODO(hibiken): Replace this with cmpopts.EquateApproxTime once it becomes availalble.
-// https://github.com/google/go-cmp/issues/166
-//
-// EquateApproxTime returns a Comparer options that
-// determine two time.Time values to be equal if they
-// are within the given time interval of one another.
-// Note that if both times have a monotonic clock reading,
-// the monotonic time difference will be used.
-//
-// The zero time is treated specially: it is only considered
-// equal to another zero time value.
-//
-// It will panic if margin is negative.
-func EquateApproxTime(margin time.Duration) cmp.Option {
-	if margin < 0 {
-		panic("negative duration in EquateApproxTime")
-	}
-	return cmp.FilterValues(func(x, y time.Time) bool {
-		return !x.IsZero() && !y.IsZero()
-	}, cmp.Comparer(timeApproximator{margin}.compare))
-}
-
-type timeApproximator struct {
-	margin time.Duration
-}
-
-func (a timeApproximator) compare(x, y time.Time) bool {
-	// Avoid subtracting times to avoid overflow when the
-	// difference is larger than the largest representible duration.
-	if x.After(y) {
-		// Ensure x is always before y
-		x, y = y, x
-	}
-	// We're within the margin if x+margin >= y.
-	// Note: time.Time doesn't have AfterOrEqual method hence the negation.
-	return !x.Add(a.margin).Before(y)
-}
-
 func TestCurrentStats(t *testing.T) {
 	r := setup(t)
 	m1 := h.NewTaskMessage("send_email", map[string]interface{}{"subject": "hello"})
@@ -535,7 +498,7 @@ func TestListDead(t *testing.T) {
 	}
 }
 
-var timeCmpOpt = EquateApproxTime(time.Second)
+var timeCmpOpt = cmpopts.EquateApproxTime(time.Second)
 
 func TestEnqueueDeadTask(t *testing.T) {
 	r := setup(t)