Merge pull request #104 from grafana/chore/remove-math

Remove package math
grafana · Dec 23, 2021 · 1a0e224 · 1a0e224
2 parents 1f49a70 + f47fcf5
commit 1a0e224
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 141 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * [CHANGE] spanlogger: Take interface implementation for extracting tenant ID. #59
 * [CHANGE] The `status_code` label on gRPC client metrics has changed from '200' and '500' to '2xx', '5xx', '4xx', 'cancel' or 'error'. #68
 * [CHANGE] Memberlist: changed probe interval from `1s` to `5s` and probe timeout from `500ms` to `2s`. #90
+* [CHANGE] Remove package `math`. #104
 * [ENHANCEMENT] Add middleware package. #38
 * [ENHANCEMENT] Add the ring package #45
 * [ENHANCEMENT] Add limiter package. #41

diff --git a/concurrency/runner.go b/concurrency/runner.go
@@ -6,7 +6,7 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/grafana/dskit/math"
+	"github.com/grafana/dskit/internal/math"
 	"github.com/grafana/dskit/multierror"
 )
 

diff --git a/internal/math/math.go b/internal/math/math.go
@@ -0,0 +1,9 @@
+package math
+
+// Min returns the minimum of two ints.
+func Min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}
diff --git a/math/math.go b/math/math.go
diff --git a/math/rate.go b/math/rate.go
diff --git a/math/rate_test.go b/math/rate_test.go
diff --git a/ring/ring.go b/ring/ring.go
@@ -23,7 +23,7 @@ import (
 	"github.com/grafana/dskit/services"
 
 	"github.com/grafana/dskit/flagext"
-	dsmath "github.com/grafana/dskit/math"
+	dsmath "github.com/grafana/dskit/internal/math"
 )
 
 const (