summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2023-01-01 21:14:26 -0700
committerLuke Shumaker <lukeshu@lukeshu.com>2023-01-01 22:42:08 -0700
commit0c706b6ad52776430ac15cf0e286dd473091d93e (patch)
tree4302ce6e93802c50f04acaec4b1cdff93e579e61
parent5edd0d7be38595c4777d5130ca20f907d8a74963 (diff)
lint: Turn on predeclared
-rw-r--r--.golangci.yml1
-rw-r--r--lib/containers/rbtree.go8
2 files changed, 4 insertions, 5 deletions
diff --git a/.golangci.yml b/.golangci.yml
index afaf507..e8b7678 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -41,7 +41,6 @@ linters:
- nestif
- nlreturn
- nonamedreturns
- - predeclared
- revive
- stylecheck
- tagliatelle
diff --git a/lib/containers/rbtree.go b/lib/containers/rbtree.go
index f922a7b..0430123 100644
--- a/lib/containers/rbtree.go
+++ b/lib/containers/rbtree.go
@@ -391,10 +391,10 @@ func (t *RBTree[K, V]) Insert(val V) {
t.root.Color = Black
}
-func (t *RBTree[K, V]) transplant(old, new *RBNode[V]) {
- *t.parentChild(old) = new
- if new != nil {
- new.Parent = old.Parent
+func (t *RBTree[K, V]) transplant(oldNode, newNode *RBNode[V]) {
+ *t.parentChild(oldNode) = newNode
+ if newNode != nil {
+ newNode.Parent = oldNode.Parent
}
}