ref: moving auxiliary data structures to the package root

robotomize · Jun 11, 2021 · 195ddb4 · 195ddb4
1 parent 254cb2c
commit 195ddb4
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 9 deletions.
diff --git a/internal/alert/alert.go b/internal/alert/alert.go
@@ -19,7 +19,7 @@ import (
 	"github.com/go-sod/sod/internal/httputil"
 	"github.com/go-sod/sod/internal/logging"
 	metricModel "github.com/go-sod/sod/internal/metric/model"
-	"github.com/go-sod/sod/pkg/container/rworker"
+	"github.com/go-sod/sod/pkg/rworker"
 )
 
 type ProvideFn = func(chan<- error) (Manager, error)

diff --git a/internal/dispatcher/manager.go b/internal/dispatcher/manager.go
@@ -13,7 +13,7 @@ import (
 	metricDb "github.com/go-sod/sod/internal/metric/database"
 	"github.com/go-sod/sod/internal/metric/model"
 	"github.com/go-sod/sod/internal/predictor"
-	"github.com/go-sod/sod/pkg/container/iqueue"
+	"github.com/go-sod/sod/pkg/iqueue"
 )
 
 // Contract for returning the Manager instance

diff --git a/internal/predictor/knn/avlnode/time_datapoint.go b/internal/predictor/knn/avlnode/time_datapoint.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/go-sod/sod/internal/predictor"
-	"github.com/go-sod/sod/pkg/container/avltree"
+	"github.com/go-sod/sod/pkg/avltree"
 )
 
 type TimeNode struct {

diff --git a/internal/predictor/knn/brute/brute.go b/internal/predictor/knn/brute/brute.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/go-sod/sod/internal/predictor"
 	"github.com/go-sod/sod/internal/predictor/knn/avlnode"
-	"github.com/go-sod/sod/pkg/container/avltree"
-	"github.com/go-sod/sod/pkg/container/pqueue"
+	"github.com/go-sod/sod/pkg/avltree"
+	"github.com/go-sod/sod/pkg/pqueue"
 )
 
 func WithMaxItems(n int) Option {

diff --git a/internal/predictor/knn/gbkd/gbkd.go b/internal/predictor/knn/gbkd/gbkd.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/go-sod/sod/internal/predictor"
 	"github.com/go-sod/sod/internal/predictor/knn/avlnode"
-	"github.com/go-sod/sod/pkg/container/avltree"
-	"github.com/go-sod/sod/pkg/container/kdtree"
+	"github.com/go-sod/sod/pkg/avltree"
+	"github.com/go-sod/sod/pkg/kdtree"
 )
 
 func WithMaxItems(n int) Option {

diff --git a/internal/scrape/scrape.go b/internal/scrape/scrape.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-sod/sod/internal/geom"
 	"github.com/go-sod/sod/internal/logging"
 	"github.com/go-sod/sod/internal/metric/model"
-	"github.com/go-sod/sod/pkg/container/rworker"
+	"github.com/go-sod/sod/pkg/rworker"
 )
 
 type response struct {

diff --git a/pkg/container/avltree/node.go → pkg/avltree/node.go b/pkg/container/avltree/node.go → pkg/avltree/node.go
diff --git a/pkg/container/avltree/tree.go → pkg/avltree/tree.go b/pkg/container/avltree/tree.go → pkg/avltree/tree.go
diff --git a/pkg/container/iqueue/queue.go → pkg/iqueue/queue.go b/pkg/container/iqueue/queue.go → pkg/iqueue/queue.go
diff --git a/pkg/container/kdtree/node.go → pkg/kdtree/node.go b/pkg/container/kdtree/node.go → pkg/kdtree/node.go
diff --git a/pkg/container/kdtree/tree.go → pkg/kdtree/tree.go b/pkg/container/kdtree/tree.go → pkg/kdtree/tree.go
@@ -21,7 +21,7 @@ import (
 	"math"
 	"sort"
 
-	"github.com/go-sod/sod/pkg/container/pqueue"
+	"github.com/go-sod/sod/pkg/pqueue"
 )
 
 type Point interface {

diff --git a/pkg/container/pqueue/queue.go → pkg/pqueue/queue.go b/pkg/container/pqueue/queue.go → pkg/pqueue/queue.go
diff --git a/pkg/container/rworker/rworker.go → pkg/rworker/rworker.go b/pkg/container/rworker/rworker.go → pkg/rworker/rworker.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ import ( @@
     	"math"
     	"sort"
-    	"github.com/go-sod/sod/pkg/container/pqueue"
+    	"github.com/go-sod/sod/pkg/pqueue"
     )
     type Point interface {
@@ Expand Down @@