NotNil -> notNil

nytopop · nytopop · commit 2d07a0c09bd3 · 2018-01-22T13:51:36.000-08:00
diff --git a/retry.go b/retry.go
@@ -35,9 +35,9 @@ func Timeout(timeout, delay time.Duration, f func() error) error {
 
 var errCeilLessThanFloor = errors.New("ceiling cannot be less than the floor")
 
-// NotNil is a condition function that if passed to a Backoff,
+// notNil is a condition function that if passed to a Backoff,
 // will continue retrying until the error is nil.
-func NotNil(err error) bool { return err != nil }
+func notNil(err error) bool { return err != nil }
 
 // Backoff implements an exponential backoff algorithm.
 // It calls f before timeout is exceeded using ceil as a maximum sleep
@@ -46,7 +46,7 @@ func NotNil(err error) bool { return err != nil }
 // it will return by timeout.
 // If timeout is 0, it will run until the function returns a nil error.
 func Backoff(timeout, ceil, floor time.Duration, f func() error) error {
-	return BackoffWhile(timeout, ceil, floor, f, NotNil)
+	return BackoffWhile(timeout, ceil, floor, f, notNil)
 }
 
 // BackoffWhile implements an exponential backoff algorithm.
@@ -95,7 +95,7 @@ func BackoffWhile(timeout, ceil, floor time.Duration, f func() error, cond func(
 // It calls f before the context is cancelled using ceil as a maximum sleep
 // interval and floor as the start interval.
 func BackoffContext(ctx context.Context, ceil, floor time.Duration, f func() error) error {
-	return BackoffContextWhile(ctx, ceil, floor, f, NotNil)
+	return BackoffContextWhile(ctx, ceil, floor, f, notNil)
 }
 
 func BackoffContextWhile(ctx context.Context, ceil, floor time.Duration, f func() error, cond func(error) bool) error {
diff --git a/retry_test.go b/retry_test.go
@@ -133,7 +133,7 @@ func TestBackoffWhile(t *testing.T) {
 		BackoffWhile(time.Second, time.Millisecond*5, time.Millisecond, func() error {
 			time.Sleep(time.Millisecond * 5)
 			return io.EOF
-		}, NotNil,
+		}, notNil,
 		)
 
 		assert.WithinDuration(t, start.Add(time.Second), time.Now(), time.Millisecond*10)
@@ -146,7 +146,7 @@ func TestBackoffWhile(t *testing.T) {
 				return nil
 			}
 			return io.EOF
-		}, NotNil,
+		}, notNil,
 		)
 
 		require.NoError(t, err)
@@ -156,7 +156,7 @@ func TestBackoffWhile(t *testing.T) {
 		err := BackoffWhile(0, 0, 5, func() error {
 			t.Fatal("should not be called?")
 			return nil
-		}, NotNil,
+		}, notNil,
 		)
 
 		require.Equal(t, errCeilLessThanFloor, err)
@@ -200,7 +200,7 @@ func TestBackoffContextWhile(t *testing.T) {
 				return nil
 			}
 			return io.EOF
-		}, NotNil,
+		}, notNil,
 		)
 
 		assert.Equal(t, 10, count)
@@ -213,7 +213,7 @@ func TestBackoffContextWhile(t *testing.T) {
 		start := time.Now()
 		BackoffContextWhile(ctx, time.Millisecond*5, time.Millisecond, func() error {
 			return io.EOF
-		}, NotNil,
+		}, notNil,
 		)
 
 		assert.WithinDuration(t, start.Add(time.Millisecond*100), time.Now(), time.Millisecond*10)

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func TestBackoffWhile(t *testing.T) {`
`133`	`133`	`BackoffWhile(time.Second, time.Millisecond*5, time.Millisecond, func() error {`
`134`	`134`	`time.Sleep(time.Millisecond * 5)`
`135`	`135`	`return io.EOF`
`136`		`- }, NotNil,`
	`136`	`+ }, notNil,`
`137`	`137`	`)`
`138`	`138`
`139`	`139`	`assert.WithinDuration(t, start.Add(time.Second), time.Now(), time.Millisecond*10)`
`@@ -146,7 +146,7 @@ func TestBackoffWhile(t *testing.T) {`
`146`	`146`	`return nil`
`147`	`147`	`}`
`148`	`148`	`return io.EOF`
`149`		`- }, NotNil,`
	`149`	`+ }, notNil,`
`150`	`150`	`)`
`151`	`151`
`152`	`152`	`require.NoError(t, err)`
`@@ -156,7 +156,7 @@ func TestBackoffWhile(t *testing.T) {`
`156`	`156`	`err := BackoffWhile(0, 0, 5, func() error {`
`157`	`157`	`t.Fatal("should not be called?")`
`158`	`158`	`return nil`
`159`		`- }, NotNil,`
	`159`	`+ }, notNil,`
`160`	`160`	`)`
`161`	`161`
`162`	`162`	`require.Equal(t, errCeilLessThanFloor, err)`
`@@ -200,7 +200,7 @@ func TestBackoffContextWhile(t *testing.T) {`
`200`	`200`	`return nil`
`201`	`201`	`}`
`202`	`202`	`return io.EOF`
`203`		`- }, NotNil,`
	`203`	`+ }, notNil,`
`204`	`204`	`)`
`205`	`205`
`206`	`206`	`assert.Equal(t, 10, count)`
`@@ -213,7 +213,7 @@ func TestBackoffContextWhile(t *testing.T) {`
`213`	`213`	`start := time.Now()`
`214`	`214`	`BackoffContextWhile(ctx, time.Millisecond*5, time.Millisecond, func() error {`
`215`	`215`	`return io.EOF`
`216`		`- }, NotNil,`
	`216`	`+ }, notNil,`
`217`	`217`	`)`
`218`	`218`
`219`	`219`	`assert.WithinDuration(t, start.Add(time.Millisecond100), time.Now(), time.Millisecond10)`