Merge pull request moby#25510 from justincormack/patricia-2.2.5

Update go-patricia to 2.2.5
rasata · Aug 9, 2016 · 34877a4 · 34877a4
2 parents b2b41b2 + e4402b2
commit 34877a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/hack/vendor.sh b/hack/vendor.sh
@@ -53,7 +53,7 @@ clone git github.com/gorilla/mux v1.1
 clone git github.com/kr/pty 5cf931ef8f
 clone git github.com/mattn/go-shellwords v1.0.0
 clone git github.com/mattn/go-sqlite3 v1.1.0
-clone git github.com/tchap/go-patricia v2.2.4
+clone git github.com/tchap/go-patricia v2.2.5
 clone git github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
 # forked golang.org/x/net package includes a patch for lazy loading trace templates
 clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git

diff --git a/vendor/src/github.com/tchap/go-patricia/patricia/children.go b/vendor/src/github.com/tchap/go-patricia/patricia/children.go
@@ -70,9 +70,8 @@ func (list *sparseChildList) add(child *Trie) childList {
 func (list *sparseChildList) remove(b byte) {
 	for i, node := range list.children {
 		if node.prefix[0] == b {
-			list.children, list.children[len(list.children)-1] =
-				append(list.children[:i], list.children[i+1:]...),
-				nil
+			copy(list.children[i:], list.children[i+1:])
+			list.children = list.children[:len(list.children)-1]
 			return
 		}
 	}