Merge pull request #1501 from nalind/update-go-patricia

Migrate from github.com/tchap/go-patricia to github.com/tchap/go-patricia/v2
containers · Feb 4, 2023 · 3230df4 · 3230df4
2 parents ad9b7d8 + 5043938
commit 3230df4
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/stretchr/testify v1.8.1
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
-	github.com/tchap/go-patricia v2.3.0+incompatible
+	github.com/tchap/go-patricia/v2 v2.3.1
 	github.com/ulikunitz/xz v0.5.11
 	github.com/vbatts/tar-split v0.11.2
 	golang.org/x/net v0.5.0

diff --git a/go.sum b/go.sum
@@ -639,8 +639,8 @@ github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
-github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs=
-github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I=
+github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes=
+github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=

diff --git a/pkg/truncindex/truncindex.go b/pkg/truncindex/truncindex.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/tchap/go-patricia/patricia"
+	"github.com/tchap/go-patricia/v2/patricia"
 )
 
 var (

diff --git a/vendor/github.com/tchap/go-patricia/AUTHORS → ...r/github.com/tchap/go-patricia/v2/AUTHORS b/vendor/github.com/tchap/go-patricia/AUTHORS → ...r/github.com/tchap/go-patricia/v2/AUTHORS
diff --git a/vendor/github.com/tchap/go-patricia/LICENSE → ...r/github.com/tchap/go-patricia/v2/LICENSE b/vendor/github.com/tchap/go-patricia/LICENSE → ...r/github.com/tchap/go-patricia/v2/LICENSE
diff --git a/...om/tchap/go-patricia/patricia/children.go → ...tchap/go-patricia/v2/patricia/children.go b/...om/tchap/go-patricia/patricia/children.go → ...tchap/go-patricia/v2/patricia/children.go
diff --git a/...om/tchap/go-patricia/patricia/patricia.go → ...tchap/go-patricia/v2/patricia/patricia.go b/...om/tchap/go-patricia/patricia/patricia.go → ...tchap/go-patricia/v2/patricia/patricia.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -139,9 +139,9 @@ github.com/stretchr/testify/require
 # github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
 ## explicit
 github.com/syndtr/gocapability/capability
-# github.com/tchap/go-patricia v2.3.0+incompatible
-## explicit
-github.com/tchap/go-patricia/patricia
+# github.com/tchap/go-patricia/v2 v2.3.1
+## explicit; go 1.16
+github.com/tchap/go-patricia/v2/patricia
 # github.com/ulikunitz/xz v0.5.11
 ## explicit; go 1.12
 github.com/ulikunitz/xz