Move top-level packages into pkg

cmd/dlv/cmds/commands.go

@@ -14,13 +14,13 @@ import (
 	"syscall"
 	"unicode"
 
-	"github.com/derekparker/delve/config"
+	"github.com/derekparker/delve/pkg/config"
+	"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/derekparker/delve/terminal"
-	"github.com/derekparker/delve/version"
 	"github.com/spf13/cobra"
 )
 

cmd/dlv/dlv_test.go

@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"testing"
 
-	protest "github.com/derekparker/delve/proc/test"
+	protest "github.com/derekparker/delve/pkg/proc/test"
 	"github.com/derekparker/delve/service/rpc2"
 )
 

cmd/dlv/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/derekparker/delve/cmd/dlv/cmds"
-	"github.com/derekparker/delve/version"
+	"github.com/derekparker/delve/pkg/version"
 )
 
 // Build is the git sha of this binaries build.

pkg/dwarf/frame/parser.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/derekparker/delve/dwarf/util"
+	"github.com/derekparker/delve/pkg/dwarf/util"
 )
 
 type parsefunc func(*parseContext) parsefunc

pkg/dwarf/frame/parser_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/davecheney/profile"
-	"github.com/derekparker/delve/dwarf/frame"
+	"github.com/derekparker/delve/pkg/dwarf/frame"
 )
 
 func BenchmarkParse(b *testing.B) {

pkg/dwarf/frame/table.go

@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/derekparker/delve/dwarf/util"
+	"github.com/derekparker/delve/pkg/dwarf/util"
 )
 
 type CurrentFrameAddress struct {

pkg/dwarf/line/line_parser.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/derekparker/delve/dwarf/util"
+	"github.com/derekparker/delve/pkg/dwarf/util"
 )
 
 type DebugLinePrologue struct {

pkg/dwarf/line/line_parser_test.go

@@ -47,7 +47,7 @@ const (
 
 func TestDebugLinePrologueParser(t *testing.T) {
 	// Test against known good values, from readelf --debug-dump=rawline _fixtures/testnextprog
-	p, err := filepath.Abs("../../_fixtures/testnextprog")
+	p, err := filepath.Abs("../../../_fixtures/testnextprog")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/dwarf/line/state_machine.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/derekparker/delve/dwarf/util"
+	"github.com/derekparker/delve/pkg/dwarf/util"
 )
 
 type Location struct {

pkg/dwarf/op/op.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/derekparker/delve/dwarf/util"
+	"github.com/derekparker/delve/pkg/dwarf/util"
 )
 
 const (

pkg/dwarf/reader/reader.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/derekparker/delve/dwarf/op"
+	"github.com/derekparker/delve/pkg/dwarf/op"
 	"golang.org/x/debug/dwarf"
 )
 

pkg/proc/eval.go

@@ -12,7 +12,7 @@ import (
 	"go/token"
 	"reflect"
 
-	"github.com/derekparker/delve/dwarf/reader"
+	"github.com/derekparker/delve/pkg/dwarf/reader"
 	"golang.org/x/debug/dwarf"
 )
 

pkg/proc/proc.go

@@ -16,9 +16,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/derekparker/delve/dwarf/frame"
+	"github.com/derekparker/delve/pkg/dwarf/frame"
-	"github.com/derekparker/delve/dwarf/line"
+	"github.com/derekparker/delve/pkg/dwarf/line"
-	"github.com/derekparker/delve/dwarf/reader"
+	"github.com/derekparker/delve/pkg/dwarf/reader"
 	"golang.org/x/debug/dwarf"
 )
 

pkg/proc/proc_darwin.go

@@ -17,8 +17,8 @@ import (
 
 	"golang.org/x/debug/macho"
 
-	"github.com/derekparker/delve/dwarf/frame"
+	"github.com/derekparker/delve/pkg/dwarf/frame"
-	"github.com/derekparker/delve/dwarf/line"
+	"github.com/derekparker/delve/pkg/dwarf/line"
 	sys "golang.org/x/sys/unix"
 )
 

pkg/proc/proc_linux.go

@@ -18,8 +18,8 @@ import (
 
 	sys "golang.org/x/sys/unix"
 
-	"github.com/derekparker/delve/dwarf/frame"
+	"github.com/derekparker/delve/pkg/dwarf/frame"
-	"github.com/derekparker/delve/dwarf/line"
+	"github.com/derekparker/delve/pkg/dwarf/line"
 	"golang.org/x/debug/elf"
 )
 

pkg/proc/proc_test.go

@@ -17,7 +17,7 @@ import (
 	"testing"
 	"time"
 
-	protest "github.com/derekparker/delve/proc/test"
+	protest "github.com/derekparker/delve/pkg/proc/test"
 )
 
 var normalLoadConfig = LoadConfig{true, 1, 64, 64, -1}
@@ -2442,7 +2442,7 @@ func TestStacktraceWithBarriers(t *testing.T) {
 			assertNoError(p.Continue(), t, "Continue()")
 			gs, err := p.GoroutinesInfo()
 			assertNoError(err, t, "GoroutinesInfo()")
-			for _, th := range p.Threads {
+			for _, th := range p.threads {
 				if th.CurrentBreakpoint == nil {
 					continue
 				}

pkg/proc/proc_unix_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	protest "github.com/derekparker/delve/proc/test"
+	protest "github.com/derekparker/delve/pkg/proc/test"
 )
 
 func TestIssue419(t *testing.T) {

pkg/proc/proc_windows.go

@@ -14,8 +14,8 @@ import (
 
 	sys "golang.org/x/sys/windows"
 
-	"github.com/derekparker/delve/dwarf/frame"
+	"github.com/derekparker/delve/pkg/dwarf/frame"
-	"github.com/derekparker/delve/dwarf/line"
+	"github.com/derekparker/delve/pkg/dwarf/line"
 	"golang.org/x/debug/dwarf"
 )
 

pkg/proc/stack.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/derekparker/delve/dwarf/frame"
+	"github.com/derekparker/delve/pkg/dwarf/frame"
 )
 
 // This code is partly adaped from runtime.gentraceback in

pkg/proc/types.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/derekparker/delve/dwarf/reader"
+	"github.com/derekparker/delve/pkg/dwarf/reader"
 
 	"golang.org/x/debug/dwarf"
 )

pkg/proc/variables.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/derekparker/delve/dwarf/op"
+	"github.com/derekparker/delve/pkg/dwarf/op"
-	"github.com/derekparker/delve/dwarf/reader"
+	"github.com/derekparker/delve/pkg/dwarf/reader"
 	"golang.org/x/debug/dwarf"
 )
 

pkg/target/target.go

@@ -5,7 +5,7 @@ import (
 	"go/ast"
 	"time"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 )
 
 // Target represents the target of the debugger. This

pkg/terminal/command_test.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/derekparker/delve/proc/test"
+	"github.com/derekparker/delve/pkg/proc/test"
 	"github.com/derekparker/delve/service"
 	"github.com/derekparker/delve/service/api"
 	"github.com/derekparker/delve/service/rpc2"

pkg/terminal/terminal.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/peterh/liner"
 
-	"github.com/derekparker/delve/config"
+	"github.com/derekparker/delve/pkg/config"
 	"github.com/derekparker/delve/service"
 )
 

pkg/terminal/terminal_test.go

@@ -4,7 +4,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/derekparker/delve/config"
+	"github.com/derekparker/delve/pkg/config"
 )
 
 type tRule struct {

service/api/conversions.go

@@ -9,7 +9,8 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
+
 	"golang.org/x/debug/dwarf"
 )
 

service/api/types.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"unicode"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 )
 
 var NotExecutableErr = proc.NotExecutableErr

service/debugger/debugger.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/derekparker/delve/pkg/target"
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 	"github.com/derekparker/delve/service/api"
 )
 

service/debugger/locations.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 	"github.com/derekparker/delve/service/api"
 )
 

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/proc.(*Process).Continue", NormalLocationSpec{"github.com/derekparker/delve/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/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/proc.Process.Continue", NormalLocationSpec{"github.com/derekparker/delve/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/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/proc.Continue", NormalLocationSpec{"github.com/derekparker/delve/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", 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})
 
 	// Function locations, package paths, line offsets
-	assertNormalLocationSpec(t, "github.com/derekparker/delve/proc.(*Process).Continue:10", NormalLocationSpec{"github.com/derekparker/delve/proc.(*Process).Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/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/proc.Process.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/proc.Process.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/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/proc.Continue:10", NormalLocationSpec{"github.com/derekparker/delve/proc.Continue", &FuncLocationSpec{PackageName: "github.com/derekparker/delve/proc", 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})
 }

service/rpc1/server.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 	"github.com/derekparker/delve/service"
 	"github.com/derekparker/delve/service/api"
 	"github.com/derekparker/delve/service/debugger"

service/rpccommon/server.go

@@ -16,12 +16,12 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"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/derekparker/delve/version"
 )
 
 // ServerImpl implements a JSON-RPC server that can switch between two

service/test/integration1_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	protest "github.com/derekparker/delve/proc/test"
+	protest "github.com/derekparker/delve/pkg/proc/test"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 	"github.com/derekparker/delve/service"
 	"github.com/derekparker/delve/service/api"
 	"github.com/derekparker/delve/service/rpc1"

service/test/integration2_test.go

@@ -12,9 +12,9 @@ import (
 	"testing"
 	"time"
 
-	protest "github.com/derekparker/delve/proc/test"
+	protest "github.com/derekparker/delve/pkg/proc/test"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 	"github.com/derekparker/delve/service"
 	"github.com/derekparker/delve/service/api"
 	"github.com/derekparker/delve/service/rpc2"

service/test/variables_test.go

@@ -7,10 +7,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/derekparker/delve/proc"
+	"github.com/derekparker/delve/pkg/proc"
 	"github.com/derekparker/delve/service/api"
 
-	protest "github.com/derekparker/delve/proc/test"
+	protest "github.com/derekparker/delve/pkg/proc/test"
 )
 
 var pnormalLoadConfig = proc.LoadConfig{true, 1, 64, 64, -1}