Updated for Go 1.18 beta 1

ancientlore · Dec 15, 2021 · 1ca70d3 · 1ca70d3
1 parent 8bb5f71
commit 1ca70d3
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ env:
   GO111MODULE=on
 
 go:
-  - 1.16.x
+  - 1.18.x
 
 before_install:
   - go get github.com/mattn/goveralls

diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module github.com/ancientlore/go-avltree/v2
 
-go 1.15
+go 1.18
diff --git a/map.go2 → map.go b/map.go2 → map.go
@@ -89,7 +89,7 @@ func (m *Map[K, V]) Find(key K) *V {
 func (m *Map[K, V]) Do(f func(K, V) bool) {
 
 	if f != nil && m.t.root != nil {
-		iterateFunc(Pair[K, V])(func(e Pair[K, V]) bool {
+		iterateFunc[Pair[K, V]](func(e Pair[K, V]) bool {
 			return f(e.Key, e.Value)
 		}).iterate(m.t.root)
 	}

diff --git a/map_test.go2 → map_test.go b/map_test.go2 → map_test.go
diff --git a/node.go2 → node.go b/node.go2 → node.go
@@ -12,15 +12,15 @@ type treeNode[T any] struct {
 	// Left and right nodes.
 	left, right *treeNode[T]
 
+	// The number of nodes in the left and right subtrees
+	// (excludes this node).
+	size int
+
 	// The contents of this node.
 	value T
 
 	// The balance factor of this node.
 	bal byte
-
-	// The number of nodes in the left and right subtrees
-	// (excludes this node).
-	size int
 }
 
 // leftSize returns the size of the left subtree

diff --git a/node_test.go2 → node_test.go b/node_test.go2 → node_test.go
diff --git a/objecttree_test.go2 → objecttree_test.go b/objecttree_test.go2 → objecttree_test.go
diff --git a/stringtree_test.go2 → stringtree_test.go b/stringtree_test.go2 → stringtree_test.go
diff --git a/tree.go2 → tree.go b/tree.go2 → tree.go
diff --git a/tree_test.go2 → tree_test.go b/tree_test.go2 → tree_test.go
diff --git a/treeadd.go2 → treeadd.go b/treeadd.go2 → treeadd.go
diff --git a/treeprint.go2 → treeprint.go b/treeprint.go2 → treeprint.go
diff --git a/treeprint_test.go2 → treeprint_test.go b/treeprint_test.go2 → treeprint_test.go
diff --git a/treeremove.go2 → treeremove.go b/treeremove.go2 → treeremove.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ env: @@
       GO111MODULE=on
     go:
-      - 1.16.x
+      - 1.18.x
     before_install:
       - go get github.com/mattn/goveralls
@@ Expand Down @@