diff --git a/go.mod b/go.mod index e20e036c..ee7f65eb 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/cosiner/argv v0.1.0 github.com/creack/pty v1.1.20 github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d + github.com/go-delve/gore v0.11.5 github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d github.com/google/go-dap v0.11.0 - github.com/goretk/gore v0.11.3 github.com/hashicorp/golang-lru v1.0.2 github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-isatty v0.0.20 diff --git a/go.sum b/go.sum index 9212c5d4..48ce7986 100644 --- a/go.sum +++ b/go.sum @@ -13,14 +13,14 @@ github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d h1:hUWoLdw5kvo2xC github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d/go.mod h1:C7Es+DLenIpPc9J6IYw4jrK0h7S9bKj4DNl8+KxGEXU= github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA= github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/go-delve/gore v0.11.5 h1:pcMZDA5G3k3tJEm4+szgqF4FeXLySy6NRbQ9Yx4wTaA= +github.com/go-delve/gore v0.11.5/go.mod h1:6RBVnEUxVGkztpRY0UDUnEzS4GqETQjWrw8rhegmN4I= github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d h1:pxjSLshkZJGLVm0wv20f/H0oTWiq/egkoJQ2ja6LEvo= github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d/go.mod h1:biJCRbqp51wS+I92HMqn5H8/A0PAhxn2vyOT+JqhiGI= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-dap v0.11.0 h1:SpAZJL41rOOvd85PuLCCLE1dteTQOyKNnn0H3DBHywo= github.com/google/go-dap v0.11.0/go.mod h1:HAeyoSd2WIfTfg+0GRXcFrb+RnojAtGNh+k+XTIxJDE= -github.com/goretk/gore v0.11.3 h1:Igk+aBl3sVEp0j6paNMaNs9hXeqC5GO9YHDqVBqiWiA= -github.com/goretk/gore v0.11.3/go.mod h1:MMkaJmF/reDsujtnLvSJBFdA5b/aZXcVKfKmMjLR+qo= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/pkg/proc/bininfo.go b/pkg/proc/bininfo.go index 02ca3014..bffd386c 100644 --- a/pkg/proc/bininfo.go +++ b/pkg/proc/bininfo.go @@ -33,7 +33,7 @@ import ( "github.com/go-delve/delve/pkg/internal/gosym" "github.com/go-delve/delve/pkg/logflags" "github.com/go-delve/delve/pkg/proc/debuginfod" - "github.com/goretk/gore" + "github.com/go-delve/gore" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/vendor/github.com/goretk/gore/.gitignore b/vendor/github.com/go-delve/gore/.gitignore similarity index 100% rename from vendor/github.com/goretk/gore/.gitignore rename to vendor/github.com/go-delve/gore/.gitignore diff --git a/vendor/github.com/goretk/gore/.gitmodules b/vendor/github.com/go-delve/gore/.gitmodules similarity index 100% rename from vendor/github.com/goretk/gore/.gitmodules rename to vendor/github.com/go-delve/gore/.gitmodules diff --git a/vendor/github.com/goretk/gore/CONTRIBUTING.md b/vendor/github.com/go-delve/gore/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/goretk/gore/CONTRIBUTING.md rename to vendor/github.com/go-delve/gore/CONTRIBUTING.md diff --git a/vendor/github.com/goretk/gore/LICENSE b/vendor/github.com/go-delve/gore/LICENSE similarity index 100% rename from vendor/github.com/goretk/gore/LICENSE rename to vendor/github.com/go-delve/gore/LICENSE diff --git a/vendor/github.com/goretk/gore/README.md b/vendor/github.com/go-delve/gore/README.md similarity index 100% rename from vendor/github.com/goretk/gore/README.md rename to vendor/github.com/go-delve/gore/README.md diff --git a/vendor/github.com/goretk/gore/buildid.go b/vendor/github.com/go-delve/gore/buildid.go similarity index 100% rename from vendor/github.com/goretk/gore/buildid.go rename to vendor/github.com/go-delve/gore/buildid.go diff --git a/vendor/github.com/goretk/gore/doc.go b/vendor/github.com/go-delve/gore/doc.go similarity index 100% rename from vendor/github.com/goretk/gore/doc.go rename to vendor/github.com/go-delve/gore/doc.go diff --git a/vendor/github.com/goretk/gore/elf.go b/vendor/github.com/go-delve/gore/elf.go similarity index 100% rename from vendor/github.com/goretk/gore/elf.go rename to vendor/github.com/go-delve/gore/elf.go diff --git a/vendor/github.com/goretk/gore/error.go b/vendor/github.com/go-delve/gore/error.go similarity index 100% rename from vendor/github.com/goretk/gore/error.go rename to vendor/github.com/go-delve/gore/error.go diff --git a/vendor/github.com/goretk/gore/file.go b/vendor/github.com/go-delve/gore/file.go similarity index 100% rename from vendor/github.com/goretk/gore/file.go rename to vendor/github.com/go-delve/gore/file.go diff --git a/vendor/github.com/goretk/gore/function.go b/vendor/github.com/go-delve/gore/function.go similarity index 100% rename from vendor/github.com/goretk/gore/function.go rename to vendor/github.com/go-delve/gore/function.go diff --git a/vendor/github.com/goretk/gore/goroot.go b/vendor/github.com/go-delve/gore/goroot.go similarity index 100% rename from vendor/github.com/goretk/gore/goroot.go rename to vendor/github.com/go-delve/gore/goroot.go diff --git a/vendor/github.com/goretk/gore/goversion.go b/vendor/github.com/go-delve/gore/goversion.go similarity index 100% rename from vendor/github.com/goretk/gore/goversion.go rename to vendor/github.com/go-delve/gore/goversion.go diff --git a/vendor/github.com/goretk/gore/goversion_gen.go b/vendor/github.com/go-delve/gore/goversion_gen.go similarity index 99% rename from vendor/github.com/goretk/gore/goversion_gen.go rename to vendor/github.com/go-delve/gore/goversion_gen.go index 704bf69d..8847a5a7 100644 --- a/vendor/github.com/goretk/gore/goversion_gen.go +++ b/vendor/github.com/go-delve/gore/goversion_gen.go @@ -17,7 +17,7 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated at -// 2023-11-10 16:31:23.856529581 +0000 UTC +// 2023-12-11 20:36:26.917404 +0000 UTC package gore @@ -213,6 +213,7 @@ var goversions = map[string]*GoVersion{ "go1.20.1": {Name: "go1.20.1", SHA: "202a1a57064127c3f19d96df57b9f9586145e21c", Timestamp: "2023-02-14T18:12:19Z"}, "go1.20.10": {Name: "go1.20.10", SHA: "8042fd87f37a725e34407994c9a11aaf95f5af45", Timestamp: "2023-10-10T16:26:21Z"}, "go1.20.11": {Name: "go1.20.11", SHA: "1d0d4b149ce71083ec474d0491851ab2d2dc695e", Timestamp: "2023-11-07T17:55:05Z"}, + "go1.20.12": {Name: "go1.20.12", SHA: "97c8ff8d53759e7a82b1862403df1694f2b6e073", Timestamp: "2023-12-05T18:12:58Z"}, "go1.20.2": {Name: "go1.20.2", SHA: "aee9a19c559da6fd258a8609556d89f6fad2a6d8", Timestamp: "2023-03-07T16:47:18Z"}, "go1.20.3": {Name: "go1.20.3", SHA: "7c47a6b15782b13ecb76fd3c6c18e5f1edc34733", Timestamp: "2023-04-04T17:30:09Z"}, "go1.20.4": {Name: "go1.20.4", SHA: "324c3ace2d2e4e30949baa23b4c9aac8a4123317", Timestamp: "2023-05-02T17:21:02Z"}, @@ -229,6 +230,7 @@ var goversions = map[string]*GoVersion{ "go1.21.2": {Name: "go1.21.2", SHA: "26b5783b72376acd0386f78295e678b9a6bff30e", Timestamp: "2023-10-05T19:06:58Z"}, "go1.21.3": {Name: "go1.21.3", SHA: "883f062fc0a097bf561030ad453fd3e300896975", Timestamp: "2023-10-10T16:31:03Z"}, "go1.21.4": {Name: "go1.21.4", SHA: "ed817f1c4055a559a94afffecbb91c78e4f39942", Timestamp: "2023-11-07T17:38:04Z"}, + "go1.21.5": {Name: "go1.21.5", SHA: "6018ad99a4a951581b2d846a8ccd6f1d4e74fd11", Timestamp: "2023-12-05T18:12:56Z"}, "go1.21rc1": {Name: "go1.21rc1", SHA: "1c1c82432a78b06c8010c7257df58ff11cc05b61", Timestamp: "2023-06-16T14:21:46Z"}, "go1.21rc2": {Name: "go1.21rc2", SHA: "d8117459c513e048eb72f11988d5416110dff359", Timestamp: "2023-06-21T15:40:05Z"}, "go1.21rc3": {Name: "go1.21rc3", SHA: "4aeac326b5cb41a24d6e48c01008abf2f0fda7ff", Timestamp: "2023-07-14T15:07:26Z"}, diff --git a/vendor/github.com/goretk/gore/macho.go b/vendor/github.com/go-delve/gore/macho.go similarity index 100% rename from vendor/github.com/goretk/gore/macho.go rename to vendor/github.com/go-delve/gore/macho.go diff --git a/vendor/github.com/goretk/gore/modinfo.go b/vendor/github.com/go-delve/gore/modinfo.go similarity index 100% rename from vendor/github.com/goretk/gore/modinfo.go rename to vendor/github.com/go-delve/gore/modinfo.go diff --git a/vendor/github.com/goretk/gore/moduledata.go b/vendor/github.com/go-delve/gore/moduledata.go similarity index 100% rename from vendor/github.com/goretk/gore/moduledata.go rename to vendor/github.com/go-delve/gore/moduledata.go diff --git a/vendor/github.com/goretk/gore/package.go b/vendor/github.com/go-delve/gore/package.go similarity index 100% rename from vendor/github.com/goretk/gore/package.go rename to vendor/github.com/go-delve/gore/package.go diff --git a/vendor/github.com/goretk/gore/pclntab.go b/vendor/github.com/go-delve/gore/pclntab.go similarity index 100% rename from vendor/github.com/goretk/gore/pclntab.go rename to vendor/github.com/go-delve/gore/pclntab.go diff --git a/vendor/github.com/goretk/gore/pe.go b/vendor/github.com/go-delve/gore/pe.go similarity index 100% rename from vendor/github.com/goretk/gore/pe.go rename to vendor/github.com/go-delve/gore/pe.go diff --git a/vendor/github.com/goretk/gore/stdpkg_gen.go b/vendor/github.com/go-delve/gore/stdpkg_gen.go similarity index 98% rename from vendor/github.com/goretk/gore/stdpkg_gen.go rename to vendor/github.com/go-delve/gore/stdpkg_gen.go index fd5c4ce2..798dc77e 100644 --- a/vendor/github.com/goretk/gore/stdpkg_gen.go +++ b/vendor/github.com/go-delve/gore/stdpkg_gen.go @@ -17,7 +17,7 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated at -// 2023-11-10 16:31:24.540225333 +0000 UTC +// 2023-12-11 20:36:27.605437 +0000 UTC package gore @@ -227,6 +227,7 @@ var stdPkgs = map[string]struct{}{ "internal/buildcfg": {}, "internal/bytealg": {}, "internal/cfg": {}, + "internal/chacha8rand": {}, "internal/coverage": {}, "internal/coverage/calloc": {}, "internal/coverage/cformat": {}, @@ -284,6 +285,9 @@ var stdPkgs = map[string]struct{}{ "internal/testpty": {}, "internal/trace": {}, "internal/trace/testdata": {}, + "internal/trace/traceviewer": {}, + "internal/trace/traceviewer/format": {}, + "internal/trace/traceviewer/static": {}, "internal/trace/v2": {}, "internal/trace/v2/event": {}, "internal/trace/v2/event/go122": {}, @@ -321,6 +325,7 @@ var stdPkgs = map[string]struct{}{ "io/fs": {}, "io/ioutil": {}, "io/ioutil/testdata": {}, + "iter": {}, "log": {}, "log/internal": {}, "log/slog": {}, @@ -353,6 +358,7 @@ var stdPkgs = map[string]struct{}{ "net/http/internal/ascii": {}, "net/http/internal/testcert": {}, "net/http/pprof": {}, + "net/http/pprof/testdata": {}, "net/http/testdata": {}, "net/internal": {}, "net/internal/socktest": {}, diff --git a/vendor/github.com/goretk/gore/type.go b/vendor/github.com/go-delve/gore/type.go similarity index 100% rename from vendor/github.com/goretk/gore/type.go rename to vendor/github.com/go-delve/gore/type.go diff --git a/vendor/github.com/goretk/gore/type2.go b/vendor/github.com/go-delve/gore/type2.go similarity index 100% rename from vendor/github.com/goretk/gore/type2.go rename to vendor/github.com/go-delve/gore/type2.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 889f36f8..502fed45 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -24,15 +24,15 @@ github.com/creack/pty # github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d ## explicit; go 1.19 github.com/derekparker/trie +# github.com/go-delve/gore v0.11.5 +## explicit; go 1.21 +github.com/go-delve/gore # github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d ## explicit github.com/go-delve/liner # github.com/google/go-dap v0.11.0 ## explicit; go 1.13 github.com/google/go-dap -# github.com/goretk/gore v0.11.3 -## explicit; go 1.21 -github.com/goretk/gore # github.com/hashicorp/golang-lru v1.0.2 ## explicit; go 1.12 github.com/hashicorp/golang-lru/simplelru