diff --git a/Documentation/KnownBugs.md b/Documentation/KnownBugs.md index a4031dec..68c04c72 100644 --- a/Documentation/KnownBugs.md +++ b/Documentation/KnownBugs.md @@ -1,6 +1,6 @@ # Known Bugs -- When a function defines two (or more) variables with the same name delve is unable to distinguish between them: `locals` will print both variables, `print` will randomly pick one. See [Issue #106](https://github.com/derekparker/delve/issues/106). -- Delve does not currently support 32bit systems. This will usually manifest as a compiler error in `proc/disasm.go`. See [Issue #20](https://github.com/derekparker/delve/issues/20). -- When Delve is compiled with versions of go prior to 1.7.0 it is not possible to set a breakpoint on a function in a remote package using the `Receiver.MethodName` syntax. See [Issue #528](https://github.com/derekparker/delve/issues/528). +- When a function defines two (or more) variables with the same name delve is unable to distinguish between them: `locals` will print both variables, `print` will randomly pick one. See [Issue #106](https://github.com/go-delve/delve/issues/106). +- Delve does not currently support 32bit systems. This will usually manifest as a compiler error in `proc/disasm.go`. See [Issue #20](https://github.com/go-delve/delve/issues/20). +- When Delve is compiled with versions of go prior to 1.7.0 it is not possible to set a breakpoint on a function in a remote package using the `Receiver.MethodName` syntax. See [Issue #528](https://github.com/go-delve/delve/issues/528). - When running Delve on binaries compiled with a version of go prior to 1.9.0 `locals` will print all local variables, including ones that are out of scope. If there are multiple variables defined with the same name in the current function `print` will not be able to select the correct one for the current line. diff --git a/Documentation/api/ClientHowto.md b/Documentation/api/ClientHowto.md index 63d279e2..50025e7c 100644 --- a/Documentation/api/ClientHowto.md +++ b/Documentation/api/ClientHowto.md @@ -27,7 +27,7 @@ Command line arguments that should be handed to the inferior process should be s dlv exec --headless ./somebinary -- these arguments are for the inferior process ``` -Specifying a static port number, like in the [README](//github.com/derekparker/Delve/tree/master/Documentation/README.md) example, can be done using `--listen=127.0.0.1:portnumber`. +Specifying a static port number, like in the [README](//github.com/go-delve/Delve/tree/master/Documentation/README.md) example, can be done using `--listen=127.0.0.1:portnumber`. This will, however, cause problems if you actually spawn multiple instances of the debugger. @@ -37,11 +37,11 @@ It's probably better to let Delve pick a random unused port number on its own. T Once you have a running headless instance you can connect to it and start sending commands. Delve's protocol is built on top of the [JSON-RPC](http://json-rpc.org) specification. -The methods of a `service/rpc2.RPCServer` are exposed through this connection, to find out which requests you can send see the documentation of RPCServer on [godoc](https://godoc.org/github.com/derekparker/Delve/service/rpc2#RPCServer). +The methods of a `service/rpc2.RPCServer` are exposed through this connection, to find out which requests you can send see the documentation of RPCServer on [godoc](https://godoc.org/github.com/go-delve/Delve/service/rpc2#RPCServer). ### Example -Let's say you are trying to create a breakpoint. By looking at [godoc](https://godoc.org/github.com/derekparker/Delve/service/rpc2#RPCServer) you'll find that there is a `CreateBreakpoint` method in `RPCServer`. +Let's say you are trying to create a breakpoint. By looking at [godoc](https://godoc.org/github.com/go-delve/Delve/service/rpc2#RPCServer) you'll find that there is a `CreateBreakpoint` method in `RPCServer`. This method, like all other methods of RPCServer that you can call through the API, has two arguments: `args` and `out`: `args` contains all the input arguments of `CreateBreakpoint`, while `out` is what `CreateBreakpoint` will return to you. @@ -178,7 +178,7 @@ from a list of all functions you should specify the name of the function in the FunctionName field of Breakpoint and set Line to -1. *Do not omit Line, do not set Line to 0*. -If you want to support the [same language as dlv's break and trace commands](//github.com/derekparker/Delve/tree/master/Documentation/cli/locspec.md) +If you want to support the [same language as dlv's break and trace commands](//github.com/go-delve/Delve/tree/master/Documentation/cli/locspec.md) you should call RPCServer.FindLocation and then use the returned slice of Location objects to create Breakpoints to pass to CreateBreakpoint: just fill each Breakpoint.Addr with the @@ -232,7 +232,7 @@ are interested in the topmost stack frame of the current goroutine (or thread) use: `EvalScope{ GoroutineID: -1, Frame: 0 }`. More information on the expression language interpreted by RPCServer.Eval -can be found [here](//github.com/derekparker/Delve/tree/master/Documentation/cli/expr.md). +can be found [here](//github.com/go-delve/Delve/tree/master/Documentation/cli/expr.md). ### Variable shadowing diff --git a/Documentation/api/json-rpc/README.md b/Documentation/api/json-rpc/README.md index 860ac130..cbdd7912 100644 --- a/Documentation/api/json-rpc/README.md +++ b/Documentation/api/json-rpc/README.md @@ -12,7 +12,7 @@ Delve currently supports two versions of its API. By default a headless instance # API version 2 documentation -All the methods of the type `service/rpc2.RPCServer` can be called using JSON-RPC, the documentation for these calls is [available on godoc](https://godoc.org/github.com/derekparker/delve/service/rpc2#RPCServer). +All the methods of the type `service/rpc2.RPCServer` can be called using JSON-RPC, the documentation for these calls is [available on godoc](https://godoc.org/github.com/go-delve/delve/service/rpc2#RPCServer). Note that all exposed methods take one single input parameter (usually called `args`) of a struct type and also return a result of a struct type. Also note that the method name should be prefixed with `RPCServer.` in JSON-RPC. diff --git a/Documentation/cli/README.md b/Documentation/cli/README.md index 0f3b707a..60454b6d 100644 --- a/Documentation/cli/README.md +++ b/Documentation/cli/README.md @@ -60,7 +60,7 @@ Sets a breakpoint. break [name] -See [Documentation/cli/locspec.md](//github.com/derekparker/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec. +See [Documentation/cli/locspec.md](//github.com/go-delve/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec. See also: "help on", "help cond" and "help clear" @@ -303,7 +303,7 @@ Evaluate an expression. [goroutine ] [frame ] print -See [Documentation/cli/expr.md](//github.com/derekparker/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. +See [Documentation/cli/expr.md](//github.com/go-delve/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. Aliases: p @@ -332,7 +332,7 @@ Changes the value of a variable. [goroutine ] [frame ] set = -See [Documentation/cli/expr.md](//github.com/derekparker/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. Only numerical variables and pointers can be changed. +See [Documentation/cli/expr.md](//github.com/go-delve/delve/tree/master/Documentation/cli/expr.md) for a description of supported expressions. Only numerical variables and pointers can be changed. ## source @@ -391,7 +391,7 @@ Set tracepoint. trace [name] -A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See [Documentation/cli/locspec.md](//github.com/derekparker/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec. +A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See [Documentation/cli/locspec.md](//github.com/go-delve/delve/tree/master/Documentation/cli/locspec.md) for the syntax of linespec. See also: "help on", "help cond" and "help clear" diff --git a/Documentation/installation/linux/install.md b/Documentation/installation/linux/install.md index 48c8f3b2..5f37ab51 100644 --- a/Documentation/installation/linux/install.md +++ b/Documentation/installation/linux/install.md @@ -5,14 +5,14 @@ Please use the following steps to build and install Delve on Linux. There are two ways to install on Linux. First is the standard `go get` method: ``` -go get -u github.com/derekparker/delve/cmd/dlv +go get -u github.com/go-delve/delve/cmd/dlv ``` Alternatively make sure $GOPATH is set (e.g. as `~/.go`) and: ``` -$ git clone https://github.com/derekparker/delve.git $GOPATH/src/github.com/derekparker/delve -$ cd $GOPATH/src/github.com/derekparker/delve +$ git clone https://github.com/go-delve/delve.git $GOPATH/src/github.com/go-delve/delve +$ cd $GOPATH/src/github.com/go-delve/delve $ make install ``` diff --git a/Documentation/installation/osx/install.md b/Documentation/installation/osx/install.md index e9cc987a..4b01b16c 100644 --- a/Documentation/installation/osx/install.md +++ b/Documentation/installation/osx/install.md @@ -9,10 +9,10 @@ This should be as simple as: Now you can install delve using `go get`: ``` -$ go get -u github.com/derekparker/delve/cmd/dlv +$ go get -u github.com/go-delve/delve/cmd/dlv ``` -With this method you will not be able to use delve's native backend, *but you don't need it anyway*: the native backend on macOS [has known problems](https://github.com/derekparker/delve/issues/1112) on recent issues of the OS and is not currently maintained. +With this method you will not be able to use delve's native backend, *but you don't need it anyway*: the native backend on macOS [has known problems](https://github.com/go-delve/delve/issues/1112) on recent issues of the OS and is not currently maintained. ## Compiling the native backend @@ -20,7 +20,7 @@ Only do this if you have a valid reason to use the native backend. 1. Run `xcode-select --install` 2. On macOS 10.14 manually install the legacy include headers by running `/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg` -3. Clone the repo into `$GOPATH/src/github.com/derekparker/delve` +3. Clone the repo into `$GOPATH/src/github.com/go-delve/delve` 4. Run `make install` in that directory (on some versions of macOS this requires being root, the first time you run it, to install a new certificate) The makefile will take care of creating and installing a self-signed certificate automatically. diff --git a/Documentation/installation/windows/install.md b/Documentation/installation/windows/install.md index d49c5856..725a3b8b 100644 --- a/Documentation/installation/windows/install.md +++ b/Documentation/installation/windows/install.md @@ -3,7 +3,7 @@ Please use the standard `go get` command to build and install Delve on Windows. ``` -go get -u github.com/derekparker/delve/cmd/dlv +go get -u github.com/go-delve/delve/cmd/dlv ``` Also, if not already set, you have to add the %GOPATH%\bin directory to your PATH variable. diff --git a/README.md b/README.md index 92b55459..14d54877 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -![Delve](https://raw.githubusercontent.com/derekparker/delve/master/assets/delve_horizontal.png) +![Delve](https://raw.githubusercontent.com/go-delve/delve/master/assets/delve_horizontal.png) -[![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/derekparker/delve/master/LICENSE) -[![GoDoc](https://godoc.org/github.com/derekparker/delve?status.svg)](https://godoc.org/github.com/derekparker/delve) -[![Build Status](https://travis-ci.org/derekparker/delve.svg?branch=master)](https://travis-ci.org/derekparker/delve) -[![Build status](https://ci.appveyor.com/api/projects/status/9e9edx1qlp3145j5/branch/master?svg=true)](https://ci.appveyor.com/project/derekparker/delve) -[![Join the chat at https://gitter.im/derekparker/delve](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/derekparker/delve?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/go-delve/delve/master/LICENSE) +[![GoDoc](https://godoc.org/github.com/go-delve/delve?status.svg)](https://godoc.org/github.com/go-delve/delve) +[![Build Status](https://travis-ci.org/go-delve/delve.svg?branch=master)](https://travis-ci.org/go-delve/delve) +[![Build status](https://ci.appveyor.com/api/projects/status/9e9edx1qlp3145j5/branch/master?svg=true)](https://ci.appveyor.com/project/go-delve/delve) +[![Join the chat at https://gitter.im/go-delve/delve](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-delve/delve?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) The Github issue tracker is for **bugs** only. Please use the [developer mailing list](https://groups.google.com/forum/#!forum/delve-dev) for any feature proposals and discussions. diff --git a/_fixtures/consts.go b/_fixtures/consts.go index 54bfa8b2..e343bdcf 100644 --- a/_fixtures/consts.go +++ b/_fixtures/consts.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" + "github.com/go-delve/delve/_fixtures/internal/dir0/pkg" "runtime" ) diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go index 5952ebeb..2f3ddb68 100644 --- a/_fixtures/dotpackagesiface.go +++ b/_fixtures/dotpackagesiface.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/derekparker/delve/_fixtures/internal/dir.io" - "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" + "github.com/go-delve/delve/_fixtures/internal/dir.io" + "github.com/go-delve/delve/_fixtures/internal/dir.io/io.io" "runtime" ) diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go index 6e0882dc..ce8bf36d 100644 --- a/_fixtures/pkgrenames.go +++ b/_fixtures/pkgrenames.go @@ -8,9 +8,9 @@ import ( pkg1 "go/ast" pkg2 "net/http" - "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" - "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" - dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" + "github.com/go-delve/delve/_fixtures/internal/dir0/pkg" + "github.com/go-delve/delve/_fixtures/internal/dir0/renamedpackage" + dir1pkg "github.com/go-delve/delve/_fixtures/internal/dir1/pkg" ) func main() { diff --git a/cmd/dlv/cmds/commands.go b/cmd/dlv/cmds/commands.go index 16d9617a..625975d1 100644 --- a/cmd/dlv/cmds/commands.go +++ b/cmd/dlv/cmds/commands.go @@ -12,15 +12,15 @@ import ( "strconv" "syscall" - "github.com/derekparker/delve/pkg/config" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/terminal" - "github.com/derekparker/delve/pkg/version" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/rpc2" - "github.com/derekparker/delve/service/rpccommon" + "github.com/go-delve/delve/pkg/config" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/terminal" + "github.com/go-delve/delve/pkg/version" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/rpc2" + "github.com/go-delve/delve/service/rpccommon" "github.com/spf13/cobra" ) diff --git a/cmd/dlv/dlv_test.go b/cmd/dlv/dlv_test.go index a992b7f8..9b7765a4 100644 --- a/cmd/dlv/dlv_test.go +++ b/cmd/dlv/dlv_test.go @@ -14,10 +14,10 @@ import ( "testing" "time" - "github.com/derekparker/delve/cmd/dlv/cmds" - protest "github.com/derekparker/delve/pkg/proc/test" - "github.com/derekparker/delve/pkg/terminal" - "github.com/derekparker/delve/service/rpc2" + "github.com/go-delve/delve/cmd/dlv/cmds" + protest "github.com/go-delve/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/terminal" + "github.com/go-delve/delve/service/rpc2" "github.com/spf13/cobra/doc" ) @@ -56,7 +56,7 @@ func projectRoot() string { for _, curpath := range gopaths { // Detects "gopath mode" when GOPATH contains several paths ex. "d:\\dir\\gopath;f:\\dir\\gopath2" if strings.Contains(wd, curpath) { - return filepath.Join(curpath, "src", "github.com", "derekparker", "delve") + return filepath.Join(curpath, "src", "github.com", "go-delve", "delve") } } val, err := exec.Command("go", "list", "-m", "-f", "{{ .Dir }}").Output() @@ -168,7 +168,7 @@ func testOutput(t *testing.T, dlvbin, output string, delveCmds []string) (stdout if strings.ToLower(os.Getenv("APPVEYOR")) != "true" { // Sometimes delve on Appveyor can't remove the built binary before // exiting and gets an "Access is denied" error when trying. - // See: https://ci.appveyor.com/project/derekparker/delve/build/1527 + // See: https://ci.appveyor.com/project/go-delve/delve/build/1527 t.Errorf("running %q: file %v was not deleted\nstdout is %q, stderr is %q", delveCmds, debugbin, stdout, stderr) } return @@ -187,9 +187,9 @@ func getDlvBin(t *testing.T) (string, string) { } dlvbin := filepath.Join(tmpdir, "dlv.exe") - out, err := exec.Command("go", "build", "-o", dlvbin, "github.com/derekparker/delve/cmd/dlv").CombinedOutput() + out, err := exec.Command("go", "build", "-o", dlvbin, "github.com/go-delve/delve/cmd/dlv").CombinedOutput() if err != nil { - t.Fatalf("go build -o %v github.com/derekparker/delve/cmd/dlv: %v\n%s", dlvbin, err, string(out)) + t.Fatalf("go build -o %v github.com/go-delve/delve/cmd/dlv: %v\n%s", dlvbin, err, string(out)) } return dlvbin, tmpdir diff --git a/cmd/dlv/main.go b/cmd/dlv/main.go index abd01060..9a89eb8e 100644 --- a/cmd/dlv/main.go +++ b/cmd/dlv/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/derekparker/delve/cmd/dlv/cmds" - "github.com/derekparker/delve/pkg/version" + "github.com/go-delve/delve/cmd/dlv/cmds" + "github.com/go-delve/delve/pkg/version" "github.com/sirupsen/logrus" ) diff --git a/pkg/dwarf/dwarfbuilder/info.go b/pkg/dwarf/dwarfbuilder/info.go index 8bf1c06e..58cb4160 100644 --- a/pkg/dwarf/dwarfbuilder/info.go +++ b/pkg/dwarf/dwarfbuilder/info.go @@ -5,8 +5,8 @@ import ( "debug/dwarf" "encoding/binary" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/util" ) // Form represents a DWARF form kind (see Figure 20, page 160 and following, diff --git a/pkg/dwarf/dwarfbuilder/loc.go b/pkg/dwarf/dwarfbuilder/loc.go index 47ef7112..357be789 100644 --- a/pkg/dwarf/dwarfbuilder/loc.go +++ b/pkg/dwarf/dwarfbuilder/loc.go @@ -3,8 +3,8 @@ package dwarfbuilder import ( "bytes" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/util" ) // LocEntry represents one entry of debug_loc. diff --git a/pkg/dwarf/frame/parser.go b/pkg/dwarf/frame/parser.go index 550f4120..122092ca 100644 --- a/pkg/dwarf/frame/parser.go +++ b/pkg/dwarf/frame/parser.go @@ -7,7 +7,7 @@ import ( "bytes" "encoding/binary" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/util" ) type parsefunc func(*parseContext) parsefunc diff --git a/pkg/dwarf/frame/parser_test.go b/pkg/dwarf/frame/parser_test.go index 07c7c31f..10211087 100644 --- a/pkg/dwarf/frame/parser_test.go +++ b/pkg/dwarf/frame/parser_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/derekparker/delve/pkg/dwarf/frame" + "github.com/go-delve/delve/pkg/dwarf/frame" "github.com/pkg/profile" ) diff --git a/pkg/dwarf/frame/table.go b/pkg/dwarf/frame/table.go index ff6621a5..4857c370 100644 --- a/pkg/dwarf/frame/table.go +++ b/pkg/dwarf/frame/table.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "fmt" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/util" ) type DWRule struct { diff --git a/pkg/dwarf/godwarf/type.go b/pkg/dwarf/godwarf/type.go index e5a0f91d..c819013e 100644 --- a/pkg/dwarf/godwarf/type.go +++ b/pkg/dwarf/godwarf/type.go @@ -16,8 +16,8 @@ import ( "reflect" "strconv" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/util" ) const ( diff --git a/pkg/dwarf/line/line_parser.go b/pkg/dwarf/line/line_parser.go index 92554ff3..b69c502e 100644 --- a/pkg/dwarf/line/line_parser.go +++ b/pkg/dwarf/line/line_parser.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "path/filepath" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/util" ) type DebugLinePrologue struct { diff --git a/pkg/dwarf/line/line_parser_test.go b/pkg/dwarf/line/line_parser_test.go index cc358b41..74a5d23c 100644 --- a/pkg/dwarf/line/line_parser_test.go +++ b/pkg/dwarf/line/line_parser_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/derekparker/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/godwarf" "github.com/pkg/profile" ) diff --git a/pkg/dwarf/line/state_machine.go b/pkg/dwarf/line/state_machine.go index 30b77a85..da92487e 100644 --- a/pkg/dwarf/line/state_machine.go +++ b/pkg/dwarf/line/state_machine.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/util" ) type Location struct { diff --git a/pkg/dwarf/op/op.go b/pkg/dwarf/op/op.go index 7cc4fe3c..89af5a68 100644 --- a/pkg/dwarf/op/op.go +++ b/pkg/dwarf/op/op.go @@ -7,7 +7,7 @@ import ( "fmt" "io" - "github.com/derekparker/delve/pkg/dwarf/util" + "github.com/go-delve/delve/pkg/dwarf/util" ) type Opcode byte diff --git a/pkg/dwarf/reader/reader.go b/pkg/dwarf/reader/reader.go index bf17b3ef..4f19b08f 100644 --- a/pkg/dwarf/reader/reader.go +++ b/pkg/dwarf/reader/reader.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/op" ) type Reader struct { diff --git a/pkg/proc/arch.go b/pkg/proc/arch.go index 5d924631..0a460eb5 100644 --- a/pkg/proc/arch.go +++ b/pkg/proc/arch.go @@ -3,8 +3,8 @@ package proc import ( "encoding/binary" - "github.com/derekparker/delve/pkg/dwarf/frame" - "github.com/derekparker/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/frame" + "github.com/go-delve/delve/pkg/dwarf/op" "golang.org/x/arch/x86/x86asm" ) diff --git a/pkg/proc/bininfo.go b/pkg/proc/bininfo.go index 9ac30e6c..babaa26d 100644 --- a/pkg/proc/bininfo.go +++ b/pkg/proc/bininfo.go @@ -18,12 +18,12 @@ import ( "sync" "time" - "github.com/derekparker/delve/pkg/dwarf/frame" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/line" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/reader" - "github.com/derekparker/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/dwarf/frame" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/line" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/goversion" ) // BinaryInfo holds information on the binary being executed. diff --git a/pkg/proc/core/core.go b/pkg/proc/core/core.go index ce0c3ed4..52c685d0 100644 --- a/pkg/proc/core/core.go +++ b/pkg/proc/core/core.go @@ -6,7 +6,7 @@ import ( "go/ast" "io" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // A SplicedMemory represents a memory space formed from multiple regions, diff --git a/pkg/proc/core/core_test.go b/pkg/proc/core/core_test.go index cd4c71fb..d6f97d53 100644 --- a/pkg/proc/core/core_test.go +++ b/pkg/proc/core/core_test.go @@ -15,9 +15,9 @@ import ( "strings" "testing" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/test" ) var buildMode string diff --git a/pkg/proc/core/linux_amd64_core.go b/pkg/proc/core/linux_amd64_core.go index a464ecfc..09b8dcc6 100644 --- a/pkg/proc/core/linux_amd64_core.go +++ b/pkg/proc/core/linux_amd64_core.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/linutil" ) // Copied from golang.org/x/sys/unix.Timeval since it's not available on all diff --git a/pkg/proc/core/minidump/minidump.go b/pkg/proc/core/minidump/minidump.go index a3bbf9f0..b3446741 100644 --- a/pkg/proc/core/minidump/minidump.go +++ b/pkg/proc/core/minidump/minidump.go @@ -24,7 +24,7 @@ import ( "unicode/utf16" "unsafe" - "github.com/derekparker/delve/pkg/proc/winutil" + "github.com/go-delve/delve/pkg/proc/winutil" ) type minidumpBuf struct { diff --git a/pkg/proc/core/windows_amd64_minidump.go b/pkg/proc/core/windows_amd64_minidump.go index 98608a9d..8775c336 100644 --- a/pkg/proc/core/windows_amd64_minidump.go +++ b/pkg/proc/core/windows_amd64_minidump.go @@ -1,10 +1,10 @@ package core import ( - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/core/minidump" - "github.com/derekparker/delve/pkg/proc/winutil" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/core/minidump" + "github.com/go-delve/delve/pkg/proc/winutil" "github.com/sirupsen/logrus" ) diff --git a/pkg/proc/dwarf_expr_test.go b/pkg/proc/dwarf_expr_test.go index 5e3e83ae..b637f5b0 100644 --- a/pkg/proc/dwarf_expr_test.go +++ b/pkg/proc/dwarf_expr_test.go @@ -12,11 +12,11 @@ import ( "go/constant" "testing" - "github.com/derekparker/delve/pkg/dwarf/dwarfbuilder" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/dwarf/dwarfbuilder" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/linutil" ) const defaultCFA = 0xc420051d00 diff --git a/pkg/proc/eval.go b/pkg/proc/eval.go index e00cca4c..1020c6c6 100644 --- a/pkg/proc/eval.go +++ b/pkg/proc/eval.go @@ -14,9 +14,9 @@ import ( "strconv" "strings" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/reader" - "github.com/derekparker/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/goversion" ) var errOperationOnSpecialFloat = errors.New("operations on non-finite floats not implemented") diff --git a/pkg/proc/fncall.go b/pkg/proc/fncall.go index 76775004..026f0520 100644 --- a/pkg/proc/fncall.go +++ b/pkg/proc/fncall.go @@ -11,10 +11,10 @@ import ( "reflect" "sort" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/reader" - "github.com/derekparker/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/logflags" "github.com/sirupsen/logrus" "golang.org/x/arch/x86/x86asm" ) diff --git a/pkg/proc/gdbserial/gdbserver.go b/pkg/proc/gdbserial/gdbserver.go index 7b8f94c6..a192ce93 100644 --- a/pkg/proc/gdbserial/gdbserver.go +++ b/pkg/proc/gdbserial/gdbserver.go @@ -79,9 +79,9 @@ import ( "golang.org/x/arch/x86/x86asm" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/linutil" isatty "github.com/mattn/go-isatty" "github.com/sirupsen/logrus" ) diff --git a/pkg/proc/gdbserial/gdbserver_conn.go b/pkg/proc/gdbserial/gdbserver_conn.go index b2dfed65..c5f14613 100644 --- a/pkg/proc/gdbserial/gdbserver_conn.go +++ b/pkg/proc/gdbserial/gdbserver_conn.go @@ -16,8 +16,8 @@ import ( "sync" "time" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/proc" "github.com/sirupsen/logrus" ) diff --git a/pkg/proc/gdbserial/rr_test.go b/pkg/proc/gdbserial/rr_test.go index fa31ac94..b6e9b030 100644 --- a/pkg/proc/gdbserial/rr_test.go +++ b/pkg/proc/gdbserial/rr_test.go @@ -9,10 +9,10 @@ import ( "runtime" "testing" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/gdbserial" - protest "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/gdbserial" + protest "github.com/go-delve/delve/pkg/proc/test" ) func TestMain(m *testing.M) { diff --git a/pkg/proc/linutil/regs.go b/pkg/proc/linutil/regs.go index 34ec80d3..5c63d4aa 100644 --- a/pkg/proc/linutil/regs.go +++ b/pkg/proc/linutil/regs.go @@ -7,7 +7,7 @@ import ( "golang.org/x/arch/x86/x86asm" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // AMD64Registers implements the proc.Registers interface for the native/linux diff --git a/pkg/proc/mem.go b/pkg/proc/mem.go index 61f8e726..1ccc024e 100644 --- a/pkg/proc/mem.go +++ b/pkg/proc/mem.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/op" ) const cacheEnabled = true diff --git a/pkg/proc/native/nonative_darwin.go b/pkg/proc/native/nonative_darwin.go index 51926596..690b3bc7 100644 --- a/pkg/proc/native/nonative_darwin.go +++ b/pkg/proc/native/nonative_darwin.go @@ -6,7 +6,7 @@ import ( "errors" "sync" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) var ErrNativeBackendDisabled = errors.New("native backend disabled during compilation") diff --git a/pkg/proc/native/proc.go b/pkg/proc/native/proc.go index d3fefe50..bf606031 100644 --- a/pkg/proc/native/proc.go +++ b/pkg/proc/native/proc.go @@ -6,7 +6,7 @@ import ( "runtime" "sync" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // Process represents all of the information the debugger diff --git a/pkg/proc/native/proc_darwin.go b/pkg/proc/native/proc_darwin.go index 80859e49..fda8c549 100644 --- a/pkg/proc/native/proc_darwin.go +++ b/pkg/proc/native/proc_darwin.go @@ -17,7 +17,7 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // OSProcessDetails holds Darwin specific information. diff --git a/pkg/proc/native/proc_linux.go b/pkg/proc/native/proc_linux.go index 7928edbe..3a7bd755 100644 --- a/pkg/proc/native/proc_linux.go +++ b/pkg/proc/native/proc_linux.go @@ -17,8 +17,8 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/linutil" isatty "github.com/mattn/go-isatty" ) diff --git a/pkg/proc/native/proc_windows.go b/pkg/proc/native/proc_windows.go index 901bcc2b..c204a5cb 100644 --- a/pkg/proc/native/proc_windows.go +++ b/pkg/proc/native/proc_windows.go @@ -12,7 +12,7 @@ import ( sys "golang.org/x/sys/windows" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // OSProcessDetails holds Windows specific information. diff --git a/pkg/proc/native/ptrace_linux.go b/pkg/proc/native/ptrace_linux.go index 83bdda14..8c33dd31 100644 --- a/pkg/proc/native/ptrace_linux.go +++ b/pkg/proc/native/ptrace_linux.go @@ -6,7 +6,7 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/proc/linutil" ) // PtraceAttach executes the sys.PtraceAttach call. @@ -69,7 +69,7 @@ func PtraceGetRegset(tid int) (regset linutil.AMD64Xstate, err error) { _, _, err = syscall.Syscall6(syscall.SYS_PTRACE, sys.PTRACE_GETREGSET, uintptr(tid), _NT_X86_XSTATE, uintptr(unsafe.Pointer(&iov)), 0, 0) if err != syscall.Errno(0) { if err == syscall.ENODEV || err == syscall.EIO { - // ignore ENODEV, it just means this CPU or kernel doesn't support XSTATE, see https://github.com/derekparker/delve/issues/1022 + // ignore ENODEV, it just means this CPU or kernel doesn't support XSTATE, see https://github.com/go-delve/delve/issues/1022 // also ignore EIO, it means that we are running on an old kernel (pre 2.6.34) and PTRACE_GETREGSET is not implemented err = nil } diff --git a/pkg/proc/native/registers_darwin_amd64.go b/pkg/proc/native/registers_darwin_amd64.go index 16fa8471..ea873448 100644 --- a/pkg/proc/native/registers_darwin_amd64.go +++ b/pkg/proc/native/registers_darwin_amd64.go @@ -12,7 +12,7 @@ import ( "golang.org/x/arch/x86/x86asm" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // Regs represents CPU registers on an AMD64 processor. diff --git a/pkg/proc/native/registers_linux_amd64.go b/pkg/proc/native/registers_linux_amd64.go index b30223ad..276d5994 100644 --- a/pkg/proc/native/registers_linux_amd64.go +++ b/pkg/proc/native/registers_linux_amd64.go @@ -5,8 +5,8 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/linutil" ) // SetPC sets RIP to the value specified by 'pc'. diff --git a/pkg/proc/native/registers_windows_amd64.go b/pkg/proc/native/registers_windows_amd64.go index 38f4da0c..32a56e8b 100644 --- a/pkg/proc/native/registers_windows_amd64.go +++ b/pkg/proc/native/registers_windows_amd64.go @@ -4,8 +4,8 @@ import ( "fmt" "unsafe" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/winutil" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/winutil" ) // SetPC sets the RIP register to the value specified by `pc`. diff --git a/pkg/proc/native/syscall_windows.go b/pkg/proc/native/syscall_windows.go index c6e74f49..b066a1bf 100644 --- a/pkg/proc/native/syscall_windows.go +++ b/pkg/proc/native/syscall_windows.go @@ -5,7 +5,7 @@ package native import ( "syscall" - "github.com/derekparker/delve/pkg/proc/winutil" + "github.com/go-delve/delve/pkg/proc/winutil" ) type _NTSTATUS int32 diff --git a/pkg/proc/native/threads.go b/pkg/proc/native/threads.go index 07c835ea..6f639d66 100644 --- a/pkg/proc/native/threads.go +++ b/pkg/proc/native/threads.go @@ -3,7 +3,7 @@ package native import ( "fmt" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // Thread represents a single thread in the traced process diff --git a/pkg/proc/native/threads_darwin.go b/pkg/proc/native/threads_darwin.go index bf422abc..9aeea20e 100644 --- a/pkg/proc/native/threads_darwin.go +++ b/pkg/proc/native/threads_darwin.go @@ -12,7 +12,7 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // WaitStatus is a synonym for the platform-specific WaitStatus diff --git a/pkg/proc/native/threads_linux.go b/pkg/proc/native/threads_linux.go index f545b12a..d33141c6 100644 --- a/pkg/proc/native/threads_linux.go +++ b/pkg/proc/native/threads_linux.go @@ -7,8 +7,8 @@ import ( sys "golang.org/x/sys/unix" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/linutil" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/linutil" ) type WaitStatus sys.WaitStatus diff --git a/pkg/proc/native/threads_windows.go b/pkg/proc/native/threads_windows.go index 63ced3b3..899962ba 100644 --- a/pkg/proc/native/threads_windows.go +++ b/pkg/proc/native/threads_windows.go @@ -6,8 +6,8 @@ import ( sys "golang.org/x/sys/windows" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/winutil" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/winutil" ) // WaitStatus is a synonym for the platform-specific WaitStatus diff --git a/pkg/proc/proc.go b/pkg/proc/proc.go index 970d297e..bc4d9d87 100644 --- a/pkg/proc/proc.go +++ b/pkg/proc/proc.go @@ -93,7 +93,7 @@ func (err *ErrFunctionNotFound) Error() string { // If lineOffset is passed FindFunctionLocation will return the address of that line // Pass lineOffset == 0 and firstLine == false if you want the address for the function's entry point // Note that setting breakpoints at that address will cause surprising behavior: -// https://github.com/derekparker/delve/issues/170 +// https://github.com/go-delve/delve/issues/170 func FindFunctionLocation(p Process, funcName string, firstLine bool, lineOffset int) (uint64, error) { bi := p.BinInfo() origfn := bi.LookupFunc[funcName] diff --git a/pkg/proc/proc_linux_test.go b/pkg/proc/proc_linux_test.go index ae018143..530bcadb 100644 --- a/pkg/proc/proc_linux_test.go +++ b/pkg/proc/proc_linux_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "github.com/derekparker/delve/pkg/proc/native" - protest "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/proc/native" + protest "github.com/go-delve/delve/pkg/proc/test" ) func TestLoadingExternalDebugInfo(t *testing.T) { diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go index c3adf297..8c890aae 100644 --- a/pkg/proc/proc_test.go +++ b/pkg/proc/proc_test.go @@ -19,13 +19,13 @@ import ( "testing" "time" - "github.com/derekparker/delve/pkg/dwarf/frame" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/gdbserial" - "github.com/derekparker/delve/pkg/proc/native" - protest "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/dwarf/frame" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/gdbserial" + "github.com/go-delve/delve/pkg/proc/native" + protest "github.com/go-delve/delve/pkg/proc/test" ) var normalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0} diff --git a/pkg/proc/proc_unix_test.go b/pkg/proc/proc_unix_test.go index e9d9602e..8a68f4b6 100644 --- a/pkg/proc/proc_unix_test.go +++ b/pkg/proc/proc_unix_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/derekparker/delve/pkg/proc" - protest "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/proc" + protest "github.com/go-delve/delve/pkg/proc/test" ) type errIssue419 struct { diff --git a/pkg/proc/scope_test.go b/pkg/proc/scope_test.go index b01ffc66..2b5c71ca 100644 --- a/pkg/proc/scope_test.go +++ b/pkg/proc/scope_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/proc" - protest "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/proc" + protest "github.com/go-delve/delve/pkg/proc/test" ) func TestScopeWithEscapedVariable(t *testing.T) { diff --git a/pkg/proc/stack.go b/pkg/proc/stack.go index 30965c89..8f71359f 100644 --- a/pkg/proc/stack.go +++ b/pkg/proc/stack.go @@ -7,9 +7,9 @@ import ( "go/constant" "strings" - "github.com/derekparker/delve/pkg/dwarf/frame" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/dwarf/frame" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/reader" ) // This code is partly adapted from runtime.gentraceback in diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go index 5f4a4127..9e09da86 100644 --- a/pkg/proc/test/support.go +++ b/pkg/proc/test/support.go @@ -13,7 +13,7 @@ import ( "sync" "testing" - "github.com/derekparker/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/goversion" ) // EnableRace allows to configure whether the race detector is enabled on target process. diff --git a/pkg/proc/threads.go b/pkg/proc/threads.go index 78450583..4d664543 100644 --- a/pkg/proc/threads.go +++ b/pkg/proc/threads.go @@ -10,8 +10,8 @@ import ( "reflect" "strings" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/reader" ) // Thread represents a thread. diff --git a/pkg/proc/types.go b/pkg/proc/types.go index d30316ff..a7f2d2e1 100644 --- a/pkg/proc/types.go +++ b/pkg/proc/types.go @@ -18,12 +18,12 @@ import ( "sync" "unsafe" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/line" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/reader" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/line" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/logflags" "github.com/sirupsen/logrus" ) diff --git a/pkg/proc/variable_test.go b/pkg/proc/variable_test.go index 3718afe1..cae41c86 100644 --- a/pkg/proc/variable_test.go +++ b/pkg/proc/variable_test.go @@ -4,8 +4,8 @@ import ( "path/filepath" "testing" - "github.com/derekparker/delve/pkg/proc" - protest "github.com/derekparker/delve/pkg/proc/test" + "github.com/go-delve/delve/pkg/proc" + protest "github.com/go-delve/delve/pkg/proc/test" ) func TestGoroutineCreationLocation(t *testing.T) { diff --git a/pkg/proc/variables.go b/pkg/proc/variables.go index ad3eedc1..5e96f719 100644 --- a/pkg/proc/variables.go +++ b/pkg/proc/variables.go @@ -15,9 +15,9 @@ import ( "strings" "unsafe" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/dwarf/op" - "github.com/derekparker/delve/pkg/dwarf/reader" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/dwarf/op" + "github.com/go-delve/delve/pkg/dwarf/reader" ) const ( diff --git a/pkg/proc/winutil/regs.go b/pkg/proc/winutil/regs.go index 7baf98ec..c8a3619b 100644 --- a/pkg/proc/winutil/regs.go +++ b/pkg/proc/winutil/regs.go @@ -6,7 +6,7 @@ import ( "golang.org/x/arch/x86/x86asm" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // AMD64Registers represents CPU registers on an AMD64 processor. diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go index b98c00db..d0d5857a 100644 --- a/pkg/terminal/command.go +++ b/pkg/terminal/command.go @@ -20,9 +20,9 @@ import ( "text/tabwriter" "github.com/cosiner/argv" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/debugger" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/debugger" ) const optimizedFunctionWarning = "Warning: debugging optimized function" @@ -114,14 +114,14 @@ Type "help" followed by the name of a command for more information about it.`}, break [name] -See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. +See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/locspec.md for the syntax of linespec. See also: "help on", "help cond" and "help clear"`}, {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. trace [name] -A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. +A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/locspec.md for the syntax of linespec. See also: "help on", "help cond" and "help clear"`}, {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. @@ -193,7 +193,7 @@ Called with more arguments it will execute a command on the specified goroutine. [goroutine ] [frame ] print -See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, +See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/expr.md for a description of supported expressions.`}, {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. whatis `}, @@ -201,7 +201,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des [goroutine ] [frame ] set = -See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, +See $GOPATH/src/github.com/go-delve/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. sources [] diff --git a/pkg/terminal/command_test.go b/pkg/terminal/command_test.go index 5a17a6a3..364ab1e3 100644 --- a/pkg/terminal/command_test.go +++ b/pkg/terminal/command_test.go @@ -15,13 +15,13 @@ import ( "testing" "time" - "github.com/derekparker/delve/pkg/config" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/proc/test" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/rpc2" - "github.com/derekparker/delve/service/rpccommon" + "github.com/go-delve/delve/pkg/config" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/proc/test" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/rpc2" + "github.com/go-delve/delve/service/rpccommon" ) var testBackend, buildMode string diff --git a/pkg/terminal/config.go b/pkg/terminal/config.go index ee0ed936..80bc4aed 100644 --- a/pkg/terminal/config.go +++ b/pkg/terminal/config.go @@ -8,7 +8,7 @@ import ( "strings" "text/tabwriter" - "github.com/derekparker/delve/pkg/config" + "github.com/go-delve/delve/pkg/config" ) func configureCmd(t *Term, ctx callContext, args string) error { diff --git a/pkg/terminal/disasmprint.go b/pkg/terminal/disasmprint.go index 313fde85..d6015ff3 100644 --- a/pkg/terminal/disasmprint.go +++ b/pkg/terminal/disasmprint.go @@ -7,7 +7,7 @@ import ( "path/filepath" "text/tabwriter" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/service/api" ) func DisasmPrint(dv api.AsmInstructions, out io.Writer) { diff --git a/pkg/terminal/docgen.go b/pkg/terminal/docgen.go index ad99e0b2..eb30dde3 100644 --- a/pkg/terminal/docgen.go +++ b/pkg/terminal/docgen.go @@ -7,7 +7,7 @@ import ( ) func replaceDocPath(s string) string { - const docpath = "$GOPATH/src/github.com/derekparker/delve/" + const docpath = "$GOPATH/src/github.com/go-delve/delve/" for { start := strings.Index(s, docpath) @@ -22,7 +22,7 @@ func replaceDocPath(s string) string { } text := s[start+len(docpath) : end] - s = s[:start] + fmt.Sprintf("[%s](//github.com/derekparker/delve/tree/master/%s)", text, text) + s[end:] + s = s[:start] + fmt.Sprintf("[%s](//github.com/go-delve/delve/tree/master/%s)", text, text) + s[end:] } } diff --git a/pkg/terminal/terminal.go b/pkg/terminal/terminal.go index 2747c06b..5e6ecbce 100644 --- a/pkg/terminal/terminal.go +++ b/pkg/terminal/terminal.go @@ -13,9 +13,9 @@ import ( "github.com/peterh/liner" - "github.com/derekparker/delve/pkg/config" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/pkg/config" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" ) const ( diff --git a/pkg/terminal/terminal_test.go b/pkg/terminal/terminal_test.go index 4aa6941d..ddf337f0 100644 --- a/pkg/terminal/terminal_test.go +++ b/pkg/terminal/terminal_test.go @@ -4,7 +4,7 @@ import ( "runtime" "testing" - "github.com/derekparker/delve/pkg/config" + "github.com/go-delve/delve/pkg/config" ) type tRule struct { diff --git a/scripts/gen-cli-docs.go b/scripts/gen-cli-docs.go index 91217f01..9e543a13 100644 --- a/scripts/gen-cli-docs.go +++ b/scripts/gen-cli-docs.go @@ -7,11 +7,11 @@ import ( "log" "os" - "github.com/derekparker/delve/pkg/terminal" + "github.com/go-delve/delve/pkg/terminal" ) func main() { - fh, err := os.Create(os.ExpandEnv("$GOPATH/src/github.com/derekparker/delve/Documentation/cli/README.md")) + fh, err := os.Create(os.ExpandEnv("$GOPATH/src/github.com/go-delve/delve/Documentation/cli/README.md")) if err != nil { log.Fatalf("could not create README.md: %v", err) } diff --git a/scripts/gen-usage-docs.go b/scripts/gen-usage-docs.go index ee969b7c..74ed9865 100644 --- a/scripts/gen-usage-docs.go +++ b/scripts/gen-usage-docs.go @@ -3,7 +3,7 @@ package main import ( - "github.com/derekparker/delve/cmd/dlv/cmds" + "github.com/go-delve/delve/cmd/dlv/cmds" "github.com/spf13/cobra/doc" ) diff --git a/scripts/make.go b/scripts/make.go index 82cff0d9..18839bf8 100644 --- a/scripts/make.go +++ b/scripts/make.go @@ -13,7 +13,7 @@ import ( "github.com/spf13/cobra" ) -const DelveMainPackagePath = "github.com/derekparker/delve/cmd/dlv" +const DelveMainPackagePath = "github.com/go-delve/delve/cmd/dlv" var Verbose bool var TestSet, TestRegex, TestBackend, TestBuildMode string @@ -75,7 +75,7 @@ Use the flags -s, -r and -b to specify which tests to run. Specifying nothing is test.PersistentFlags().StringVarP(&TestSet, "test-set", "s", "", `Select the set of tests to run, one of either: all tests all packages basic tests proc, integration and terminal - integration tests github.com/derekparker/delve/service/test + integration tests github.com/go-delve/delve/service/test package-name test the specified package only `) test.PersistentFlags().StringVarP(&TestRegex, "test-run", "r", "", `Only runs the tests matching the specified regex. This option can only be specified if testset is a single package`) @@ -362,10 +362,10 @@ func testSetToPackages(testSet string) []string { return allPackages() case "basic": - return []string{"github.com/derekparker/delve/pkg/proc", "github.com/derekparker/delve/service/test", "github.com/derekparker/delve/pkg/terminal"} + return []string{"github.com/go-delve/delve/pkg/proc", "github.com/go-delve/delve/service/test", "github.com/go-delve/delve/pkg/terminal"} case "integration": - return []string{"github.com/derekparker/delve/service/test"} + return []string{"github.com/go-delve/delve/service/test"} default: for _, pkg := range allPackages() { diff --git a/service/api/conversions.go b/service/api/conversions.go index 3daf42cb..9c1495bb 100644 --- a/service/api/conversions.go +++ b/service/api/conversions.go @@ -8,8 +8,8 @@ import ( "reflect" "strconv" - "github.com/derekparker/delve/pkg/dwarf/godwarf" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/dwarf/godwarf" + "github.com/go-delve/delve/pkg/proc" ) // ConvertBreakpoint converts from a proc.Breakpoint to diff --git a/service/api/types.go b/service/api/types.go index 7873382c..db1e0cb7 100644 --- a/service/api/types.go +++ b/service/api/types.go @@ -8,7 +8,7 @@ import ( "strconv" "unicode" - "github.com/derekparker/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc" ) // ErrNotExecutable is an error returned when trying diff --git a/service/client.go b/service/client.go index d0f9a04a..c1e5b49b 100644 --- a/service/client.go +++ b/service/client.go @@ -3,7 +3,7 @@ package service import ( "time" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/service/api" ) // Client represents a debugger service client. All client methods are diff --git a/service/debugger/debugger.go b/service/debugger/debugger.go index fefc4a2f..ce9acac1 100644 --- a/service/debugger/debugger.go +++ b/service/debugger/debugger.go @@ -13,13 +13,13 @@ import ( "sync" "time" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/core" - "github.com/derekparker/delve/pkg/proc/gdbserial" - "github.com/derekparker/delve/pkg/proc/native" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/core" + "github.com/go-delve/delve/pkg/proc/gdbserial" + "github.com/go-delve/delve/pkg/proc/native" + "github.com/go-delve/delve/service/api" "github.com/sirupsen/logrus" ) diff --git a/service/debugger/locations.go b/service/debugger/locations.go index 5595a446..47aae743 100644 --- a/service/debugger/locations.go +++ b/service/debugger/locations.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/service/api" ) const maxFindLocationCandidates = 5 diff --git a/service/debugger/locations_test.go b/service/debugger/locations_test.go index f090704b..cfe3d941 100644 --- a/service/debugger/locations_test.go +++ b/service/debugger/locations_test.go @@ -57,12 +57,12 @@ func TestFunctionLocationParsing(t *testing.T) { assertNormalLocationSpec(t, "Continue:10", NormalLocationSpec{"Continue", &FuncLocationSpec{BaseName: "Continue"}, 10}) // Function locations, package paths, no line offsets - assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.(*Process).Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Process.Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Continue", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", BaseName: "Continue"}, -1}) + assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.(*Process).Continue", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) + assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Process.Continue", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, -1}) + assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Continue", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", BaseName: "Continue"}, -1}) // Function locations, package paths, line offsets - assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Process.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) - assertNormalLocationSpec(t, "github.com/derekparker/delve/pkg/proc.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/pkg/proc", BaseName: "Continue"}, 10}) + assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) + assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Process.Continue:10", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", ReceiverName: "Process", BaseName: "Continue"}, 10}) + assertNormalLocationSpec(t, "github.com/go-delve/delve/pkg/proc.Continue:10", NormalLocationSpec{"github.com/go-delve/delve/pkg/proc.Continue", &FuncLocationSpec{PackageName: "github.com/go-delve/delve/pkg/proc", BaseName: "Continue"}, 10}) } diff --git a/service/rpc1/client.go b/service/rpc1/client.go index c0f25356..945ac18b 100644 --- a/service/rpc1/client.go +++ b/service/rpc1/client.go @@ -9,7 +9,7 @@ import ( "sync" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/service/api" ) // Client is a RPC service.Client. diff --git a/service/rpc1/server.go b/service/rpc1/server.go index e71e1348..af11ec65 100644 --- a/service/rpc1/server.go +++ b/service/rpc1/server.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/debugger" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/debugger" ) var defaultLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0} diff --git a/service/rpc2/client.go b/service/rpc2/client.go index fc4501cb..eaaae016 100644 --- a/service/rpc2/client.go +++ b/service/rpc2/client.go @@ -8,8 +8,8 @@ import ( "net/rpc/jsonrpc" "time" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" ) // Client is a RPC service.Client. diff --git a/service/rpc2/server.go b/service/rpc2/server.go index 62edb30e..9e11018a 100644 --- a/service/rpc2/server.go +++ b/service/rpc2/server.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/debugger" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/debugger" ) type RPCServer struct { @@ -423,7 +423,7 @@ type EvalOut struct { // EvalVariable returns a variable in the specified context. // -// See https://github.com/derekparker/delve/wiki/Expressions for +// See https://github.com/go-delve/delve/wiki/Expressions for // a description of acceptable values of arg.Expr. func (s *RPCServer) Eval(arg EvalIn, out *EvalOut) error { cfg := arg.Cfg diff --git a/service/rpccommon/server.go b/service/rpccommon/server.go index 9e842bb2..217207ce 100644 --- a/service/rpccommon/server.go +++ b/service/rpccommon/server.go @@ -16,13 +16,13 @@ import ( "unicode" "unicode/utf8" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/pkg/version" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/debugger" - "github.com/derekparker/delve/service/rpc1" - "github.com/derekparker/delve/service/rpc2" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/pkg/version" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/debugger" + "github.com/go-delve/delve/service/rpc1" + "github.com/go-delve/delve/service/rpc2" "github.com/sirupsen/logrus" ) diff --git a/service/test/common_test.go b/service/test/common_test.go index 0103bc3e..2b58e371 100644 --- a/service/test/common_test.go +++ b/service/test/common_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/service/api" ) func assertNoError(err error, t *testing.T, s string) { diff --git a/service/test/integration1_test.go b/service/test/integration1_test.go index 185b6e8c..35c65836 100644 --- a/service/test/integration1_test.go +++ b/service/test/integration1_test.go @@ -11,13 +11,13 @@ import ( "testing" "time" - protest "github.com/derekparker/delve/pkg/proc/test" + protest "github.com/go-delve/delve/pkg/proc/test" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/rpc1" - "github.com/derekparker/delve/service/rpccommon" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/rpc1" + "github.com/go-delve/delve/service/rpccommon" ) func withTestClient1(name string, t *testing.T, fn func(c *rpc1.RPCClient)) { diff --git a/service/test/integration2_test.go b/service/test/integration2_test.go index cacb8fe6..4ccc68f8 100644 --- a/service/test/integration2_test.go +++ b/service/test/integration2_test.go @@ -14,14 +14,14 @@ import ( "testing" "time" - protest "github.com/derekparker/delve/pkg/proc/test" + protest "github.com/go-delve/delve/pkg/proc/test" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/logflags" - "github.com/derekparker/delve/service" - "github.com/derekparker/delve/service/api" - "github.com/derekparker/delve/service/rpc2" - "github.com/derekparker/delve/service/rpccommon" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/logflags" + "github.com/go-delve/delve/service" + "github.com/go-delve/delve/service/api" + "github.com/go-delve/delve/service/rpc2" + "github.com/go-delve/delve/service/rpccommon" ) var normalLoadConfig = api.LoadConfig{true, 1, 64, 64, -1} diff --git a/service/test/variables_test.go b/service/test/variables_test.go index 8e9e8837..09fd564f 100644 --- a/service/test/variables_test.go +++ b/service/test/variables_test.go @@ -8,13 +8,13 @@ import ( "strings" "testing" - "github.com/derekparker/delve/pkg/goversion" - "github.com/derekparker/delve/pkg/proc" - "github.com/derekparker/delve/pkg/proc/gdbserial" - "github.com/derekparker/delve/pkg/proc/native" - "github.com/derekparker/delve/service/api" + "github.com/go-delve/delve/pkg/goversion" + "github.com/go-delve/delve/pkg/proc" + "github.com/go-delve/delve/pkg/proc/gdbserial" + "github.com/go-delve/delve/pkg/proc/native" + "github.com/go-delve/delve/service/api" - protest "github.com/derekparker/delve/pkg/proc/test" + protest "github.com/go-delve/delve/pkg/proc/test" ) var pnormalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1, 0} @@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, // Package name that doesn't match import path - {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, + {"iface3", true, `interface {}(*github.com/go-delve/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, // Interfaces to anonymous types {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", …", "", "interface {}", nil}, - {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, - {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, - {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, - {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, - {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, - {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, - {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, - {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, - {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, - {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, + {"dir0someType", true, "interface {}(*github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, + {"dir1someType", true, "interface {}(github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, + {"amap3", true, "interface {}(map[github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, + {"anarray", true, `interface {}([2]github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, + {"achan", true, `interface {}(chan github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, + {"aslice", true, `interface {}([]github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, + {"afunc", true, `interface {}(func(github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, + {"astruct", true, `interface {}(*struct { A github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, + {"astruct2", true, `interface {}(*struct { github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, + {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/go-delve/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, {`"dir0/pkg".A`, false, "0", "", "int", nil}, {`"dir1/pkg".A`, false, "1", "", "int", nil}, @@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { // before 1.9 embedded struct field have fieldname == type if tc.name == "astruct2" { - tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` + tc.value = `interface {}(*struct { github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/go-delve/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` } } variable, err := evalVariable(p, tc.name, pnormalLoadConfig)