TBR renaming v.io/core/veyron to v.io/x/ref
(and getting rid of unused shell scripts)
MultiPart: 5/13
Change-Id: I09d9df0f4dc7df3d5ca5588513be27b08fe1fd4a
diff --git a/lib/GO.PACKAGE b/lib/GO.PACKAGE
index 5071fbd..8252cab 100644
--- a/lib/GO.PACKAGE
+++ b/lib/GO.PACKAGE
@@ -1,7 +1,7 @@
{
"dependencies": {
"incoming": [
- {"allow": "v.io/core/veyron/lib/..."},
+ {"allow": "v.io/x/ref/lib/..."},
{"allow": "...", "comment": "dependencies on veyron/lib are temporarily allowed"}
]
}
diff --git a/lib/exec/child.go b/lib/exec/child.go
index bec0100..ea02bf8 100644
--- a/lib/exec/child.go
+++ b/lib/exec/child.go
@@ -9,7 +9,7 @@
"sync"
"unicode/utf8"
- "v.io/core/veyron/lib/exec/consts"
+ "v.io/x/ref/lib/exec/consts"
)
var (
diff --git a/lib/exec/exec_test.go b/lib/exec/exec_test.go
index e8de2cd..4fbdd48 100644
--- a/lib/exec/exec_test.go
+++ b/lib/exec/exec_test.go
@@ -13,10 +13,10 @@
"time"
"unicode/utf8"
- vexec "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/lib/exec/consts"
+ vexec "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/exec/consts"
// Use mock timekeeper to avoid actually sleeping during the test.
- "v.io/core/veyron/lib/testutil/timekeeper"
+ "v.io/x/ref/lib/testutil/timekeeper"
)
// We always expect there to be exactly three open file descriptors
diff --git a/lib/exec/parent.go b/lib/exec/parent.go
index 463223b..0c31dcf 100644
--- a/lib/exec/parent.go
+++ b/lib/exec/parent.go
@@ -16,8 +16,8 @@
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/exec/consts"
- "v.io/core/veyron/lib/timekeeper"
+ "v.io/x/ref/lib/exec/consts"
+ "v.io/x/ref/lib/timekeeper"
)
var (
diff --git a/lib/expect/expect_test.go b/lib/expect/expect_test.go
index fb6f579..9dfcf03 100644
--- a/lib/expect/expect_test.go
+++ b/lib/expect/expect_test.go
@@ -9,7 +9,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
+ "v.io/x/ref/lib/expect"
)
func TestSimple(t *testing.T) {
diff --git a/lib/filelocker/locker_test.go b/lib/filelocker/locker_test.go
index 46f7bb6..ca4763e 100644
--- a/lib/filelocker/locker_test.go
+++ b/lib/filelocker/locker_test.go
@@ -10,8 +10,8 @@
"testing"
"time"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
)
//go:generate v23 test generate
diff --git a/lib/filelocker/v23_internal_test.go b/lib/filelocker/v23_internal_test.go
index 680f581..65ed9a5 100644
--- a/lib/filelocker/v23_internal_test.go
+++ b/lib/filelocker/v23_internal_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("testLockChild", ``, testLockChild)
diff --git a/lib/flags/buildinfo/buildinfo.go b/lib/flags/buildinfo/buildinfo.go
index f7574cb..7835af3 100644
--- a/lib/flags/buildinfo/buildinfo.go
+++ b/lib/flags/buildinfo/buildinfo.go
@@ -6,7 +6,7 @@
)
// These variables are filled in at link time, using:
-// -ldflags "-X v.io/core/veyron/lib/flags/buildinfo.<varname> <value>"
+// -ldflags "-X v.io/x/ref/lib/flags/buildinfo.<varname> <value>"
var timestamp, username, platform string
// T describes binary metadata.
diff --git a/lib/flags/flags.go b/lib/flags/flags.go
index ce1ff24..9db7e9a 100644
--- a/lib/flags/flags.go
+++ b/lib/flags/flags.go
@@ -7,8 +7,8 @@
"strings"
"sync"
- "v.io/core/veyron/lib/flags/buildinfo"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags/buildinfo"
+ "v.io/x/ref/lib/flags/consts"
)
// FlagGroup is the type for identifying groups of related flags.
diff --git a/lib/flags/flags_test.go b/lib/flags/flags_test.go
index 6ec6e37..ed85864 100644
--- a/lib/flags/flags_test.go
+++ b/lib/flags/flags_test.go
@@ -7,8 +7,8 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/flags"
- "v.io/core/veyron/lib/flags/consts"
+ "v.io/x/ref/lib/flags"
+ "v.io/x/ref/lib/flags/consts"
)
func TestFlags(t *testing.T) {
diff --git a/lib/flags/listen_test.go b/lib/flags/listen_test.go
index d9c9f55..8c047df 100644
--- a/lib/flags/listen_test.go
+++ b/lib/flags/listen_test.go
@@ -6,7 +6,7 @@
"strings"
"testing"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
func TestIPFlag(t *testing.T) {
diff --git a/lib/flags/main.go b/lib/flags/main.go
index dd6e009..9995db0 100644
--- a/lib/flags/main.go
+++ b/lib/flags/main.go
@@ -7,7 +7,7 @@
"fmt"
"os"
- "v.io/core/veyron/lib/flags"
+ "v.io/x/ref/lib/flags"
)
func main() {
diff --git a/lib/modules/core/core_test.go b/lib/modules/core/core_test.go
index 6ea1d49..3f521cc 100644
--- a/lib/modules/core/core_test.go
+++ b/lib/modules/core/core_test.go
@@ -12,12 +12,12 @@
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/modules/core"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/modules/core"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
// We create our own TestMain here because v23 test generate currently does not
diff --git a/lib/modules/core/echo.go b/lib/modules/core/echo.go
index 6da6936..e8a3809 100644
--- a/lib/modules/core/echo.go
+++ b/lib/modules/core/echo.go
@@ -10,7 +10,7 @@
"v.io/v23/ipc"
"v.io/v23/security"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
func init() {
diff --git a/lib/modules/core/misc.go b/lib/modules/core/misc.go
index d6b9c7c..580b39b 100644
--- a/lib/modules/core/misc.go
+++ b/lib/modules/core/misc.go
@@ -5,7 +5,7 @@
"io"
"time"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
)
func init() {
diff --git a/lib/modules/core/mounttable.go b/lib/modules/core/mounttable.go
index 1e95b34..9752635 100644
--- a/lib/modules/core/mounttable.go
+++ b/lib/modules/core/mounttable.go
@@ -11,8 +11,8 @@
"v.io/v23/naming"
"v.io/v23/options"
- "v.io/core/veyron/lib/modules"
- mounttable "v.io/core/veyron/services/mounttable/lib"
+ "v.io/x/ref/lib/modules"
+ mounttable "v.io/x/ref/services/mounttable/lib"
)
var details *bool
diff --git a/lib/modules/core/proxy.go b/lib/modules/core/proxy.go
index 2cfbd04..af2c411 100644
--- a/lib/modules/core/proxy.go
+++ b/lib/modules/core/proxy.go
@@ -9,9 +9,9 @@
"v.io/v23"
"v.io/v23/naming"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/runtimes/google/ipc/stream/proxy"
- "v.io/core/veyron/runtimes/google/lib/publisher"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/runtimes/google/ipc/stream/proxy"
+ "v.io/x/ref/runtimes/google/lib/publisher"
)
func init() {
diff --git a/lib/modules/core/test_identityd.go b/lib/modules/core/test_identityd.go
index 080fe6d..7ef34de 100644
--- a/lib/modules/core/test_identityd.go
+++ b/lib/modules/core/test_identityd.go
@@ -10,15 +10,15 @@
"v.io/v23"
- "v.io/core/veyron/lib/modules"
+ "v.io/x/ref/lib/modules"
- "v.io/core/veyron/services/identity/auditor"
- "v.io/core/veyron/services/identity/blesser"
- "v.io/core/veyron/services/identity/caveats"
- "v.io/core/veyron/services/identity/oauth"
- "v.io/core/veyron/services/identity/revocation"
- "v.io/core/veyron/services/identity/server"
- "v.io/core/veyron/services/identity/util"
+ "v.io/x/ref/services/identity/auditor"
+ "v.io/x/ref/services/identity/blesser"
+ "v.io/x/ref/services/identity/caveats"
+ "v.io/x/ref/services/identity/oauth"
+ "v.io/x/ref/services/identity/revocation"
+ "v.io/x/ref/services/identity/server"
+ "v.io/x/ref/services/identity/util"
)
var (
diff --git a/lib/modules/core/wspr.go b/lib/modules/core/wspr.go
index 9027d2a..29ef5e8 100644
--- a/lib/modules/core/wspr.go
+++ b/lib/modules/core/wspr.go
@@ -5,8 +5,8 @@
"fmt"
"io"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/services/wsprd/wspr"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/services/wsprd/wspr"
"v.io/v23"
)
diff --git a/lib/modules/examples_test.go b/lib/modules/examples_test.go
index e4ab42a..5b18040 100644
--- a/lib/modules/examples_test.go
+++ b/lib/modules/examples_test.go
@@ -5,8 +5,8 @@
"io"
"os"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
)
func init() {
diff --git a/lib/modules/exec.go b/lib/modules/exec.go
index c179d45..08b14b5 100644
--- a/lib/modules/exec.go
+++ b/lib/modules/exec.go
@@ -10,9 +10,9 @@
"sync"
"time"
- vexec "v.io/core/veyron/lib/exec"
"v.io/v23/mgmt"
"v.io/x/lib/vlog"
+ vexec "v.io/x/ref/lib/exec"
)
// execHandle implements both the command and Handle interfaces.
diff --git a/lib/modules/modules_internal_test.go b/lib/modules/modules_internal_test.go
index 393991b..678608a 100644
--- a/lib/modules/modules_internal_test.go
+++ b/lib/modules/modules_internal_test.go
@@ -7,8 +7,8 @@
"runtime"
"testing"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
)
func Echo(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
diff --git a/lib/modules/modules_test.go b/lib/modules/modules_test.go
index b647654..092765d 100644
--- a/lib/modules/modules_test.go
+++ b/lib/modules/modules_test.go
@@ -13,14 +13,14 @@
"testing"
"time"
- "v.io/core/veyron/lib/exec"
- execconsts "v.io/core/veyron/lib/exec/consts"
+ "v.io/x/ref/lib/exec"
+ execconsts "v.io/x/ref/lib/exec/consts"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/security"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/security"
+ _ "v.io/x/ref/profiles"
"v.io/v23"
)
diff --git a/lib/modules/queue_rw.go b/lib/modules/queue_rw.go
index 6d1d317..f092408 100644
--- a/lib/modules/queue_rw.go
+++ b/lib/modules/queue_rw.go
@@ -5,7 +5,7 @@
"sync"
// TODO(caprita): Move upcqueue into veyron/lib.
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
// queueRW implements a ReadWriteCloser backed by an unbounded in-memory
diff --git a/lib/modules/queue_rw_test.go b/lib/modules/queue_rw_test.go
index e6bc984..26f6f19 100644
--- a/lib/modules/queue_rw_test.go
+++ b/lib/modules/queue_rw_test.go
@@ -5,8 +5,8 @@
"io"
"testing"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
)
func TestQueueRW(t *testing.T) {
diff --git a/lib/modules/registry.go b/lib/modules/registry.go
index a3e9e16..110c145 100644
--- a/lib/modules/registry.go
+++ b/lib/modules/registry.go
@@ -11,7 +11,7 @@
"v.io/x/lib/vlog"
- vexec "v.io/core/veyron/lib/exec"
+ vexec "v.io/x/ref/lib/exec"
)
type commandDesc struct {
diff --git a/lib/modules/shell.go b/lib/modules/shell.go
index 0152bd9..55be3b3 100644
--- a/lib/modules/shell.go
+++ b/lib/modules/shell.go
@@ -48,12 +48,12 @@
"v.io/v23/security"
- "v.io/core/veyron/lib/exec"
- "v.io/core/veyron/lib/flags/consts"
- "v.io/core/veyron/security/agent"
- "v.io/core/veyron/security/agent/keymgr"
"v.io/v23"
"v.io/v23/context"
+ "v.io/x/ref/lib/exec"
+ "v.io/x/ref/lib/flags/consts"
+ "v.io/x/ref/security/agent"
+ "v.io/x/ref/security/agent/keymgr"
)
const (
diff --git a/lib/modules/util.go b/lib/modules/util.go
index 529ac4b..3f1731c 100644
--- a/lib/modules/util.go
+++ b/lib/modules/util.go
@@ -8,7 +8,7 @@
"os"
"strings"
- vsecurity "v.io/core/veyron/security"
+ vsecurity "v.io/x/ref/security"
"v.io/v23/security"
"v.io/x/lib/vlog"
diff --git a/lib/netconfig/example_test.go b/lib/netconfig/example_test.go
index a6fcfa0..33ab162 100644
--- a/lib/netconfig/example_test.go
+++ b/lib/netconfig/example_test.go
@@ -4,7 +4,7 @@
"fmt"
"log"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/netconfig"
)
func ExampleNetConfigWatcher() {
diff --git a/lib/netstate/netstate.go b/lib/netstate/netstate.go
index 673168c..623e7b2 100644
--- a/lib/netstate/netstate.go
+++ b/lib/netstate/netstate.go
@@ -54,7 +54,7 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/netconfig"
)
// AddrIfc represents a network address and the network interface that
diff --git a/lib/netstate/netstate_test.go b/lib/netstate/netstate_test.go
index a774ec9..954b9d4 100644
--- a/lib/netstate/netstate_test.go
+++ b/lib/netstate/netstate_test.go
@@ -7,8 +7,8 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/netconfig"
- "v.io/core/veyron/lib/netstate"
+ "v.io/x/ref/lib/netconfig"
+ "v.io/x/ref/lib/netstate"
)
func TestGet(t *testing.T) {
diff --git a/lib/netstate/route.go b/lib/netstate/route.go
index 58515b9..906dc9e 100644
--- a/lib/netstate/route.go
+++ b/lib/netstate/route.go
@@ -7,7 +7,7 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/netconfig"
+ "v.io/x/ref/lib/netconfig"
)
// Interface represents a network interface.
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index 3117cf7..9e99bf8 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -19,12 +19,12 @@
"v.io/v23/services/mgmt/appcycle"
"v.io/v23/vtrace"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- _ "v.io/core/veyron/profiles"
- vflag "v.io/core/veyron/security/flag"
- "v.io/core/veyron/services/mgmt/device"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ _ "v.io/x/ref/profiles"
+ vflag "v.io/x/ref/security/flag"
+ "v.io/x/ref/services/mgmt/device"
)
//go:generate v23 test generate
diff --git a/lib/signals/v23_internal_test.go b/lib/signals/v23_internal_test.go
index 1c70736..51d914f 100644
--- a/lib/signals/v23_internal_test.go
+++ b/lib/signals/v23_internal_test.go
@@ -10,8 +10,8 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/modules"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/modules"
+import "v.io/x/ref/lib/testutil"
func init() {
modules.RegisterChild("handleDefaults", ``, handleDefaults)
diff --git a/lib/stats/counter.go b/lib/stats/counter.go
index 3a1945b..3f2beff 100644
--- a/lib/stats/counter.go
+++ b/lib/stats/counter.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/core/veyron/lib/stats/counter"
+ "v.io/x/ref/lib/stats/counter"
)
// NewCounter creates a new Counter StatsObject with the given name and
diff --git a/lib/stats/counter/counter_test.go b/lib/stats/counter/counter_test.go
index 2c87bcb..dba6c39 100644
--- a/lib/stats/counter/counter_test.go
+++ b/lib/stats/counter/counter_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/stats/counter"
+ "v.io/x/ref/lib/stats/counter"
)
func TestCounter(t *testing.T) {
diff --git a/lib/stats/counter/tracker_test.go b/lib/stats/counter/tracker_test.go
index 6793e01..b8b5235 100644
--- a/lib/stats/counter/tracker_test.go
+++ b/lib/stats/counter/tracker_test.go
@@ -8,7 +8,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/stats/counter"
+ "v.io/x/ref/lib/stats/counter"
)
var trackerTests = []struct {
diff --git a/lib/stats/glob.go b/lib/stats/glob.go
index eff004b..25884d1 100644
--- a/lib/stats/glob.go
+++ b/lib/stats/glob.go
@@ -5,7 +5,7 @@
"sort"
"time"
- "v.io/core/veyron/lib/glob"
+ "v.io/x/ref/lib/glob"
)
// Glob returns the name and (optionally) the value of all the objects that
diff --git a/lib/stats/histogram.go b/lib/stats/histogram.go
index 9baa8a8..280b5ba 100644
--- a/lib/stats/histogram.go
+++ b/lib/stats/histogram.go
@@ -3,7 +3,7 @@
import (
"time"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats/histogram"
)
// NewHistogram creates a new Histogram StatsObject with the given name and
diff --git a/lib/stats/histogram/histogram.go b/lib/stats/histogram/histogram.go
index e668a9a..dd6aaa9 100644
--- a/lib/stats/histogram/histogram.go
+++ b/lib/stats/histogram/histogram.go
@@ -6,8 +6,8 @@
"fmt"
"time"
- "v.io/core/veyron/lib/stats/counter"
- "v.io/core/veyron/services/mgmt/stats"
+ "v.io/x/ref/lib/stats/counter"
+ "v.io/x/ref/services/mgmt/stats"
)
// A Histogram accumulates values in the form of a histogram. The type of the
diff --git a/lib/stats/histogram/histogram_test.go b/lib/stats/histogram/histogram_test.go
index f788e9f..f213809 100644
--- a/lib/stats/histogram/histogram_test.go
+++ b/lib/stats/histogram/histogram_test.go
@@ -3,7 +3,7 @@
import (
"testing"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats/histogram"
)
func TestHistogram(t *testing.T) {
diff --git a/lib/stats/stats_test.go b/lib/stats/stats_test.go
index ae68648..5c5a596 100644
--- a/lib/stats/stats_test.go
+++ b/lib/stats/stats_test.go
@@ -5,10 +5,10 @@
"testing"
"time"
- libstats "v.io/core/veyron/lib/stats"
- "v.io/core/veyron/lib/stats/counter"
- "v.io/core/veyron/lib/stats/histogram"
- istats "v.io/core/veyron/services/mgmt/stats"
+ libstats "v.io/x/ref/lib/stats"
+ "v.io/x/ref/lib/stats/counter"
+ "v.io/x/ref/lib/stats/histogram"
+ istats "v.io/x/ref/services/mgmt/stats"
)
func doGlob(root, pattern string, since time.Time, includeValues bool) ([]libstats.KeyValue, error) {
diff --git a/lib/stats/sysstats/sysstats.go b/lib/stats/sysstats/sysstats.go
index 1db188b..76eafac 100644
--- a/lib/stats/sysstats/sysstats.go
+++ b/lib/stats/sysstats/sysstats.go
@@ -10,8 +10,8 @@
"strings"
"time"
- "v.io/core/veyron/lib/flags/buildinfo"
- "v.io/core/veyron/lib/stats"
+ "v.io/x/ref/lib/flags/buildinfo"
+ "v.io/x/ref/lib/stats"
)
func init() {
diff --git a/lib/stats/sysstats/sysstats_test.go b/lib/stats/sysstats/sysstats_test.go
index d157b5e..e86557f 100644
--- a/lib/stats/sysstats/sysstats_test.go
+++ b/lib/stats/sysstats/sysstats_test.go
@@ -4,8 +4,8 @@
"os"
"testing"
- "v.io/core/veyron/lib/stats"
- _ "v.io/core/veyron/lib/stats/sysstats"
+ "v.io/x/ref/lib/stats"
+ _ "v.io/x/ref/lib/stats/sysstats"
)
func TestHostname(t *testing.T) {
diff --git a/lib/testutil/benchmark/stats.go b/lib/testutil/benchmark/stats.go
index 62790a6..ce9e169 100644
--- a/lib/testutil/benchmark/stats.go
+++ b/lib/testutil/benchmark/stats.go
@@ -7,7 +7,7 @@
"math"
"time"
- "v.io/core/veyron/lib/stats/histogram"
+ "v.io/x/ref/lib/stats/histogram"
)
// Stats is a simple helper for gathering additional statistics like histogram
diff --git a/lib/testutil/benchmark/stats_test.go b/lib/testutil/benchmark/stats_test.go
index 7072963..d315f67 100644
--- a/lib/testutil/benchmark/stats_test.go
+++ b/lib/testutil/benchmark/stats_test.go
@@ -5,7 +5,7 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil/benchmark"
+ "v.io/x/ref/lib/testutil/benchmark"
)
func TestStatsBasic(t *testing.T) {
diff --git a/lib/testutil/init.go b/lib/testutil/init.go
index fa1f8b1..ab09904 100644
--- a/lib/testutil/init.go
+++ b/lib/testutil/init.go
@@ -2,7 +2,7 @@
//
// Configures logging, random number generators and other global state.
// Typical usage in _test.go files:
-// import "v.io/core/veyron/lib/testutil"
+// import "v.io/x/ref/lib/testutil"
// func TestMain(m *testing.M) {
// testutil.Init()
// os.Exit(m.Run())
@@ -18,7 +18,7 @@
"sync"
"time"
- tsecurity "v.io/core/veyron/lib/testutil/security"
+ tsecurity "v.io/x/ref/lib/testutil/security"
"v.io/v23"
"v.io/v23/context"
diff --git a/lib/testutil/security/util.go b/lib/testutil/security/util.go
index 3901177..a9eb884 100644
--- a/lib/testutil/security/util.go
+++ b/lib/testutil/security/util.go
@@ -26,7 +26,7 @@
"io/ioutil"
"os"
- vsecurity "v.io/core/veyron/security"
+ vsecurity "v.io/x/ref/security"
"v.io/v23/security"
"v.io/v23/services/security/access"
diff --git a/lib/testutil/security/util_test.go b/lib/testutil/security/util_test.go
index ea7b51a..b080e6f 100644
--- a/lib/testutil/security/util_test.go
+++ b/lib/testutil/security/util_test.go
@@ -10,8 +10,8 @@
"v.io/v23/security"
"v.io/v23/services/security/access"
- _ "v.io/core/veyron/profiles"
- vsecurity "v.io/core/veyron/security"
+ _ "v.io/x/ref/profiles"
+ vsecurity "v.io/x/ref/security"
)
func unsortedEquals(a, b []string) bool {
diff --git a/lib/testutil/timekeeper/manual_time.go b/lib/testutil/timekeeper/manual_time.go
index d247a4c..4d36539 100644
--- a/lib/testutil/timekeeper/manual_time.go
+++ b/lib/testutil/timekeeper/manual_time.go
@@ -5,7 +5,7 @@
"sync"
"time"
- "v.io/core/veyron/lib/timekeeper"
+ "v.io/x/ref/lib/timekeeper"
)
// ManualTime is a time keeper that allows control over the advancement of time.
diff --git a/lib/testutil/v23tests/internal/cached_test.go b/lib/testutil/v23tests/internal/cached_test.go
index 688ba64..651e7f6 100644
--- a/lib/testutil/v23tests/internal/cached_test.go
+++ b/lib/testutil/v23tests/internal/cached_test.go
@@ -9,9 +9,9 @@
"testing"
"time"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles"
)
//go:generate v23 test generate
@@ -31,7 +31,7 @@
// build build's a binary and appends it's modtime to the
// global slice modTimes
func build(i *v23tests.T) {
- nsBin := i.BuildGoPkg("v.io/core/veyron/tools/namespace")
+ nsBin := i.BuildGoPkg("v.io/x/ref/tools/namespace")
fi, err := os.Stat(nsBin.Path())
if err != nil {
i.Fatal()
diff --git a/lib/testutil/v23tests/internal/v23_test.go b/lib/testutil/v23tests/internal/v23_test.go
index f1d42e7..fdcea7a 100644
--- a/lib/testutil/v23tests/internal/v23_test.go
+++ b/lib/testutil/v23tests/internal/v23_test.go
@@ -8,7 +8,7 @@
import "testing"
-import "v.io/core/veyron/lib/testutil/v23tests"
+import "v.io/x/ref/lib/testutil/v23tests"
func TestV23One(t *testing.T) {
v23tests.RunTest(t, V23TestOne)
diff --git a/lib/testutil/v23tests/v23tests.go b/lib/testutil/v23tests/v23tests.go
index fda96b9..e9c0682 100644
--- a/lib/testutil/v23tests/v23tests.go
+++ b/lib/testutil/v23tests/v23tests.go
@@ -91,11 +91,11 @@
"v.io/v23/security"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- tsecurity "v.io/core/veyron/lib/testutil/security"
- "v.io/core/veyron/security/agent"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ tsecurity "v.io/x/ref/lib/testutil/security"
+ "v.io/x/ref/security/agent"
)
// TB is an exact mirror of testing.TB. It is provided to allow for testing
@@ -833,7 +833,7 @@
// the NAMESPACE_ROOT variable in the test environment so that all subsequent
// invocations will access this root mount table.
func RunRootMT(i *T, args ...string) (*Binary, *Invocation) {
- b := i.BuildGoPkg("v.io/core/veyron/services/mounttable/mounttabled")
+ b := i.BuildGoPkg("v.io/x/ref/services/mounttable/mounttabled")
inv := b.start(1, args...)
name := inv.ExpectVar("NAME")
inv.Environment().SetVar("NAMESPACE_ROOT", name)
diff --git a/lib/testutil/v23tests/v23tests_test.go b/lib/testutil/v23tests/v23tests_test.go
index 9ab4eab..480ad07 100644
--- a/lib/testutil/v23tests/v23tests_test.go
+++ b/lib/testutil/v23tests/v23tests_test.go
@@ -15,11 +15,11 @@
"v.io/v23/naming"
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/expect"
- "v.io/core/veyron/lib/modules"
- "v.io/core/veyron/lib/testutil"
- "v.io/core/veyron/lib/testutil/v23tests"
- _ "v.io/core/veyron/profiles"
+ "v.io/x/ref/lib/expect"
+ "v.io/x/ref/lib/modules"
+ "v.io/x/ref/lib/testutil"
+ "v.io/x/ref/lib/testutil/v23tests"
+ _ "v.io/x/ref/profiles"
)
// TODO(sjr): add more unit tests, especially for errors cases.
@@ -47,8 +47,8 @@
defer env.Cleanup()
v23tests.RunRootMT(env, "--veyron.tcp.address=127.0.0.1:0")
- proxyBin := env.BuildGoPkg("v.io/core/veyron/services/proxy/proxyd")
- nsBin := env.BuildGoPkg("v.io/core/veyron/tools/namespace")
+ proxyBin := env.BuildGoPkg("v.io/x/ref/services/proxy/proxyd")
+ nsBin := env.BuildGoPkg("v.io/x/ref/tools/namespace")
mt, ok := env.GetVar("NAMESPACE_ROOT")
if !ok || len(mt) == 0 {
@@ -384,7 +384,7 @@
func builder(t *testing.T) (string, string) {
env := v23tests.New(t)
defer env.Cleanup()
- bin := env.BuildGoPkg("v.io/core/veyron/lib/testutil/v23tests")
+ bin := env.BuildGoPkg("v.io/x/ref/lib/testutil/v23tests")
return env.BinDir(), bin.Path()
}
diff --git a/lib/vdl/build/build.go b/lib/vdl/build/build.go
index 43147a1..bf3327d 100644
--- a/lib/vdl/build/build.go
+++ b/lib/vdl/build/build.go
@@ -48,12 +48,12 @@
"sort"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
"v.io/x/lib/toposort"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const vdlrootImportPrefix = "v.io/v23/vdlroot"
diff --git a/lib/vdl/build/build_test.go b/lib/vdl/build/build_test.go
index de76ed4..e583a50 100644
--- a/lib/vdl/build/build_test.go
+++ b/lib/vdl/build/build_test.go
@@ -9,13 +9,13 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/testdata/base"
- "v.io/core/veyron/lib/vdl/vdltest"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/testdata/base"
+ "v.io/x/ref/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func init() {
@@ -25,7 +25,7 @@
// The cwd is set to the directory containing this file. Currently we have the
// following directory structure:
-// .../release/go/src/v.io/core/veyron/lib/vdl/build/build_test.go
+// .../release/go/src/v.io/x/ref/lib/vdl/build/build_test.go
// We want to end up with the following:
// VDLROOT = .../release/go/src/v.io/v23/vdlroot
// VDLPATH = .../release/go
@@ -226,101 +226,101 @@
{[]string{}, nil, nil},
// Single-package, both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
[]string{"../testdata/base"},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
// Single-package with wildcard, both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base..."},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base/..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base/..."},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
[]string{"../testdata/base..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
[]string{"../testdata/base/..."},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
// Redundant specification as both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata/base", "../testdata/base"},
- []string{"v.io/core/veyron/lib/vdl/testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base", "../testdata/base"},
+ []string{"v.io/x/ref/lib/vdl/testdata/base"},
nil,
},
{
- []string{"v.io/core/veyron/lib/vdl/testdata/arith", "../testdata/arith"},
+ []string{"v.io/x/ref/lib/vdl/testdata/arith", "../testdata/arith"},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
},
nil,
},
// Wildcards as both import and dir path.
{
- []string{"v.io/core/veyron/lib/vdl/testdata..."},
+ []string{"v.io/x/ref/lib/vdl/testdata..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
- []string{"v.io/core/veyron/lib/vdl/testdata/..."},
+ []string{"v.io/x/ref/lib/vdl/testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
[]string{"../testdata..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
[]string{"../testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
@@ -328,38 +328,38 @@
{
[]string{"v...vdl/testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
{
[]string{"../../...vdl/testdata/..."},
[]string{
- "v.io/core/veyron/lib/vdl/testdata/arith/exp",
- "v.io/core/veyron/lib/vdl/testdata/base",
- "v.io/core/veyron/lib/vdl/testdata/arith",
- "v.io/core/veyron/lib/vdl/testdata/nativetest",
- "v.io/core/veyron/lib/vdl/testdata/nativedep",
- "v.io/core/veyron/lib/vdl/testdata/nativedep2",
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/arith/exp",
+ "v.io/x/ref/lib/vdl/testdata/base",
+ "v.io/x/ref/lib/vdl/testdata/arith",
+ "v.io/x/ref/lib/vdl/testdata/nativetest",
+ "v.io/x/ref/lib/vdl/testdata/nativedep",
+ "v.io/x/ref/lib/vdl/testdata/nativedep2",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
},
nil,
},
// Multi-Wildcards as both import and dir path.
{
[]string{"v...vdl/testdata/...exp"},
- []string{"v.io/core/veyron/lib/vdl/testdata/arith/exp"},
+ []string{"v.io/x/ref/lib/vdl/testdata/arith/exp"},
nil,
},
{
[]string{"../../...vdl/testdata/...exp"},
- []string{"v.io/core/veyron/lib/vdl/testdata/arith/exp"},
+ []string{"v.io/x/ref/lib/vdl/testdata/arith/exp"},
nil,
},
// Standard vdl package, as both import and dir path.
@@ -492,9 +492,9 @@
Path string
Config vdltool.Config
}{
- {"v.io/core/veyron/lib/vdl/testdata/base", vdltool.Config{}},
+ {"v.io/x/ref/lib/vdl/testdata/base", vdltool.Config{}},
{
- "v.io/core/veyron/lib/vdl/testdata/testconfig",
+ "v.io/x/ref/lib/vdl/testdata/testconfig",
vdltool.Config{
GenLanguages: map[vdltool.GenLanguage]struct{}{vdltool.GenLanguageGo: struct{}{}},
},
@@ -530,15 +530,15 @@
Value interface{}
}{
{
- `config = x;import "v.io/core/veyron/lib/vdl/testdata/base";const x = base.NamedBool(true)`,
+ `config = x;import "v.io/x/ref/lib/vdl/testdata/base";const x = base.NamedBool(true)`,
base.NamedBool(true),
},
{
- `config = x;import "v.io/core/veyron/lib/vdl/testdata/base";const x = base.NamedString("abc")`,
+ `config = x;import "v.io/x/ref/lib/vdl/testdata/base";const x = base.NamedString("abc")`,
base.NamedString("abc"),
},
{
- `config = x;import "v.io/core/veyron/lib/vdl/testdata/base";const x = base.Args{1, 2}`,
+ `config = x;import "v.io/x/ref/lib/vdl/testdata/base";const x = base.Args{1, 2}`,
base.Args{1, 2},
},
}
diff --git a/lib/vdl/codegen/golang/const.go b/lib/vdl/codegen/golang/const.go
index 6dd1214..84cf374 100644
--- a/lib/vdl/codegen/golang/const.go
+++ b/lib/vdl/codegen/golang/const.go
@@ -4,9 +4,9 @@
"fmt"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
)
func constDefGo(data goData, def *compile.ConstDef) string {
diff --git a/lib/vdl/codegen/golang/const_test.go b/lib/vdl/codegen/golang/const_test.go
index dc760fe..eb37459 100644
--- a/lib/vdl/codegen/golang/const_test.go
+++ b/lib/vdl/codegen/golang/const_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
func TestConst(t *testing.T) {
diff --git a/lib/vdl/codegen/golang/gen.go b/lib/vdl/codegen/golang/gen.go
index 3bd149e..2a65794 100644
--- a/lib/vdl/codegen/golang/gen.go
+++ b/lib/vdl/codegen/golang/gen.go
@@ -9,11 +9,11 @@
"strings"
"text/template"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
type goData struct {
@@ -96,8 +96,8 @@
// Restrict the feature to these whitelisted VDL packages for now.
var nativeTypePackageWhitelist = map[string]bool{
"time": true,
- "v.io/core/veyron/lib/vdl/testdata/nativetest": true,
- "v.io/v23/security": true,
+ "v.io/x/ref/lib/vdl/testdata/nativetest": true,
+ "v.io/v23/security": true,
}
func validateGoConfig(file *compile.File, env *compile.Env) {
diff --git a/lib/vdl/codegen/golang/import.go b/lib/vdl/codegen/golang/import.go
index 7d19f42..558c071 100644
--- a/lib/vdl/codegen/golang/import.go
+++ b/lib/vdl/codegen/golang/import.go
@@ -6,21 +6,21 @@
"sort"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// goImport represents a single import in the generated Go file.
-// Example A: import "v.io/core/abc"
-// Example B: import foo "v.io/core/abc"
+// Example A: import "v.io/v23/abc"
+// Example B: import foo "v.io/v23/abc"
type goImport struct {
// Name of the import.
// Example A: ""
// Example B: "foo"
Name string
// Path of the import.
- // Example A: "v.io/core/abc"
- // Example B: "v.io/core/abc"
+ // Example A: "v.io/v23/abc"
+ // Example B: "v.io/v23/abc"
Path string
// Local identifier within the generated go file to reference the imported
// package.
diff --git a/lib/vdl/codegen/golang/type.go b/lib/vdl/codegen/golang/type.go
index d9f3e6a..7d2ae59 100644
--- a/lib/vdl/codegen/golang/type.go
+++ b/lib/vdl/codegen/golang/type.go
@@ -5,9 +5,9 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/compile"
)
func localIdent(data goData, file *compile.File, ident string) string {
diff --git a/lib/vdl/codegen/golang/type_test.go b/lib/vdl/codegen/golang/type_test.go
index 9504c2c..b253617 100644
--- a/lib/vdl/codegen/golang/type_test.go
+++ b/lib/vdl/codegen/golang/type_test.go
@@ -3,8 +3,8 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
func TestType(t *testing.T) {
diff --git a/lib/vdl/codegen/import.go b/lib/vdl/codegen/import.go
index 82c63ff..1397d42 100644
--- a/lib/vdl/codegen/import.go
+++ b/lib/vdl/codegen/import.go
@@ -5,8 +5,8 @@
"sort"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// TODO(toddw): Remove this file, after all code generators have been updated to
diff --git a/lib/vdl/codegen/java/file_array.go b/lib/vdl/codegen/java/file_array.go
index 7803721..919208c 100644
--- a/lib/vdl/codegen/java/file_array.go
+++ b/lib/vdl/codegen/java/file_array.go
@@ -6,7 +6,7 @@
"log"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const arrayTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_client_factory.go b/lib/vdl/codegen/java/file_client_factory.go
index df62723..d7e90db 100644
--- a/lib/vdl/codegen/java/file_client_factory.go
+++ b/lib/vdl/codegen/java/file_client_factory.go
@@ -5,7 +5,7 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const clientFactoryTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_client_interface.go b/lib/vdl/codegen/java/file_client_interface.go
index 879d472..0ea8327 100644
--- a/lib/vdl/codegen/java/file_client_interface.go
+++ b/lib/vdl/codegen/java/file_client_interface.go
@@ -6,8 +6,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const clientInterfaceTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_client_stub.go b/lib/vdl/codegen/java/file_client_stub.go
index 31ebcab..0b9a82a 100644
--- a/lib/vdl/codegen/java/file_client_stub.go
+++ b/lib/vdl/codegen/java/file_client_stub.go
@@ -5,8 +5,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const clientStubTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_complex.go b/lib/vdl/codegen/java/file_complex.go
index e2f457e..f415419 100644
--- a/lib/vdl/codegen/java/file_complex.go
+++ b/lib/vdl/codegen/java/file_complex.go
@@ -5,8 +5,8 @@
"fmt"
"log"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
const complexTmpl = `
diff --git a/lib/vdl/codegen/java/file_constants.go b/lib/vdl/codegen/java/file_constants.go
index 28b525f..7a2934e 100644
--- a/lib/vdl/codegen/java/file_constants.go
+++ b/lib/vdl/codegen/java/file_constants.go
@@ -4,8 +4,8 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const constTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_enum.go b/lib/vdl/codegen/java/file_enum.go
index 6da2c16..166650c 100644
--- a/lib/vdl/codegen/java/file_enum.go
+++ b/lib/vdl/codegen/java/file_enum.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const enumTmpl = `
diff --git a/lib/vdl/codegen/java/file_errors.go b/lib/vdl/codegen/java/file_errors.go
index 4aa8306..0dee049 100644
--- a/lib/vdl/codegen/java/file_errors.go
+++ b/lib/vdl/codegen/java/file_errors.go
@@ -4,8 +4,8 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const errorTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_list.go b/lib/vdl/codegen/java/file_list.go
index 4fba2c8..1a392e3 100644
--- a/lib/vdl/codegen/java/file_list.go
+++ b/lib/vdl/codegen/java/file_list.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const listTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_map.go b/lib/vdl/codegen/java/file_map.go
index e618743..078878a 100644
--- a/lib/vdl/codegen/java/file_map.go
+++ b/lib/vdl/codegen/java/file_map.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const mapTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_package_info.go b/lib/vdl/codegen/java/file_package_info.go
index 9d30e24..aebcbe1 100644
--- a/lib/vdl/codegen/java/file_package_info.go
+++ b/lib/vdl/codegen/java/file_package_info.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const packageTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_primitive.go b/lib/vdl/codegen/java/file_primitive.go
index 2543296..e392a77 100644
--- a/lib/vdl/codegen/java/file_primitive.go
+++ b/lib/vdl/codegen/java/file_primitive.go
@@ -4,8 +4,8 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
const primitiveTmpl = `
diff --git a/lib/vdl/codegen/java/file_server_interface.go b/lib/vdl/codegen/java/file_server_interface.go
index c85e92f..8b5bb74 100644
--- a/lib/vdl/codegen/java/file_server_interface.go
+++ b/lib/vdl/codegen/java/file_server_interface.go
@@ -6,8 +6,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const serverInterfaceTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_server_wrapper.go b/lib/vdl/codegen/java/file_server_wrapper.go
index f25a775..8b84587 100644
--- a/lib/vdl/codegen/java/file_server_wrapper.go
+++ b/lib/vdl/codegen/java/file_server_wrapper.go
@@ -5,8 +5,8 @@
"log"
"path"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const serverWrapperTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_set.go b/lib/vdl/codegen/java/file_set.go
index 7c7817d..433afb6 100644
--- a/lib/vdl/codegen/java/file_set.go
+++ b/lib/vdl/codegen/java/file_set.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const setTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_struct.go b/lib/vdl/codegen/java/file_struct.go
index 7066dc5..50c2ccd 100644
--- a/lib/vdl/codegen/java/file_struct.go
+++ b/lib/vdl/codegen/java/file_struct.go
@@ -4,9 +4,9 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
const structTmpl = `// This file was auto-generated by the veyron vdl tool.
diff --git a/lib/vdl/codegen/java/file_union.go b/lib/vdl/codegen/java/file_union.go
index 9b53103..a5cc3f3 100644
--- a/lib/vdl/codegen/java/file_union.go
+++ b/lib/vdl/codegen/java/file_union.go
@@ -4,7 +4,7 @@
"bytes"
"log"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
const unionTmpl = `
diff --git a/lib/vdl/codegen/java/generate.go b/lib/vdl/codegen/java/generate.go
index 11c137e..781b4cc 100644
--- a/lib/vdl/codegen/java/generate.go
+++ b/lib/vdl/codegen/java/generate.go
@@ -4,8 +4,8 @@
import (
"path"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// pkgPathXlator is the function used to translate a VDL package path
@@ -102,7 +102,7 @@
// Restrict the feature to these whitelisted VDL packages for now.
var nativeTypePackageWhitelist = map[string]bool{
"time": true,
- "v.io/core/veyron/lib/vdl/testdata/nativetest": true,
+ "v.io/x/ref/lib/vdl/testdata/nativetest": true,
}
func validateJavaConfig(pkg *compile.Package, env *compile.Env) {
diff --git a/lib/vdl/codegen/java/util_args.go b/lib/vdl/codegen/java/util_args.go
index c586a34..841acde 100644
--- a/lib/vdl/codegen/java/util_args.go
+++ b/lib/vdl/codegen/java/util_args.go
@@ -4,7 +4,7 @@
"bytes"
"fmt"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
// javaDeclarationArgStr creates a comma separated string of args to be used in a function declaration
diff --git a/lib/vdl/codegen/java/util_file.go b/lib/vdl/codegen/java/util_file.go
index 4f488e2..dd51498 100644
--- a/lib/vdl/codegen/java/util_file.go
+++ b/lib/vdl/codegen/java/util_file.go
@@ -3,7 +3,7 @@
import (
"bytes"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
// javaFileNames constructs a comma separated string with the short (basename) of the input files
diff --git a/lib/vdl/codegen/java/util_interface.go b/lib/vdl/codegen/java/util_interface.go
index 27ae408..9735b4d 100644
--- a/lib/vdl/codegen/java/util_interface.go
+++ b/lib/vdl/codegen/java/util_interface.go
@@ -4,7 +4,7 @@
"bytes"
"path"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
// allEmbeddedIfaces returns all unique interfaces in the embed tree
diff --git a/lib/vdl/codegen/java/util_method.go b/lib/vdl/codegen/java/util_method.go
index ed19ddf..c24762a 100644
--- a/lib/vdl/codegen/java/util_method.go
+++ b/lib/vdl/codegen/java/util_method.go
@@ -5,7 +5,7 @@
"fmt"
"sort"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
)
func isStreamingMethod(method *compile.Method) bool {
diff --git a/lib/vdl/codegen/java/util_type.go b/lib/vdl/codegen/java/util_type.go
index 78e8f26..5fae3f6 100644
--- a/lib/vdl/codegen/java/util_type.go
+++ b/lib/vdl/codegen/java/util_type.go
@@ -6,9 +6,9 @@
"path"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func javaFullyQualifiedNamedType(def *compile.TypeDef, forceClass bool, env *compile.Env) string {
diff --git a/lib/vdl/codegen/java/util_val.go b/lib/vdl/codegen/java/util_val.go
index 6d9f054..f61f6a8 100644
--- a/lib/vdl/codegen/java/util_val.go
+++ b/lib/vdl/codegen/java/util_val.go
@@ -5,8 +5,8 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// javaConstVal returns the value string for the provided constant value.
diff --git a/lib/vdl/codegen/javascript/error_test.go b/lib/vdl/codegen/javascript/error_test.go
index 763ca93..226dba3 100644
--- a/lib/vdl/codegen/javascript/error_test.go
+++ b/lib/vdl/codegen/javascript/error_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/i18n"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
func TestError(t *testing.T) {
@@ -13,7 +13,7 @@
NamePos: compile.NamePos{
Name: "Test",
},
- ID: "v.io/core/veyron/lib/vdl/codegen/javascript.Test",
+ ID: "v.io/x/ref/lib/vdl/codegen/javascript.Test",
RetryCode: vdl.WireRetryCodeNoRetry,
Params: []*compile.Field{
&compile.Field{
@@ -42,7 +42,7 @@
}
var names typeNames
result := generateErrorConstructor(names, e)
- expected := `module.exports.TestError = makeError('v.io/core/veyron/lib/vdl/codegen/javascript.Test', actions.NO_RETRY, {
+ expected := `module.exports.TestError = makeError('v.io/x/ref/lib/vdl/codegen/javascript.Test', actions.NO_RETRY, {
'en-US': 'english string',
'fr': 'french string',
}, [
diff --git a/lib/vdl/codegen/javascript/errors.go b/lib/vdl/codegen/javascript/errors.go
index 3d25d06..ee9f418 100644
--- a/lib/vdl/codegen/javascript/errors.go
+++ b/lib/vdl/codegen/javascript/errors.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func generateErrorConstructor(names typeNames, e *compile.ErrorDef) string {
diff --git a/lib/vdl/codegen/javascript/gen.go b/lib/vdl/codegen/javascript/gen.go
index 1434291..e60d38b 100644
--- a/lib/vdl/codegen/javascript/gen.go
+++ b/lib/vdl/codegen/javascript/gen.go
@@ -15,9 +15,9 @@
"strings"
"text/template"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
type data struct {
diff --git a/lib/vdl/codegen/javascript/import.go b/lib/vdl/codegen/javascript/import.go
index 3c0e07e..6bdd5a7 100644
--- a/lib/vdl/codegen/javascript/import.go
+++ b/lib/vdl/codegen/javascript/import.go
@@ -4,8 +4,8 @@
"sort"
"strconv"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
// TODO(bjornick): Merge with pkg_types.go
diff --git a/lib/vdl/codegen/javascript/pkg_types.go b/lib/vdl/codegen/javascript/pkg_types.go
index 5b79d69..c6325c4 100644
--- a/lib/vdl/codegen/javascript/pkg_types.go
+++ b/lib/vdl/codegen/javascript/pkg_types.go
@@ -5,7 +5,7 @@
"sort"
"strings"
- "v.io/core/veyron/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/compile"
"v.io/v23/vdl"
)
diff --git a/lib/vdl/codegen/javascript/type_test.go b/lib/vdl/codegen/javascript/type_test.go
index 7231046..bc3df73 100644
--- a/lib/vdl/codegen/javascript/type_test.go
+++ b/lib/vdl/codegen/javascript/type_test.go
@@ -4,8 +4,8 @@
"fmt"
"testing"
- "v.io/core/veyron/lib/vdl/compile"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/compile"
)
const unnamedTypeFieldName = "UnnamedTypeField"
diff --git a/lib/vdl/codegen/vdlgen/const.go b/lib/vdl/codegen/vdlgen/const.go
index 18faf86..df1e6da 100644
--- a/lib/vdl/codegen/vdlgen/const.go
+++ b/lib/vdl/codegen/vdlgen/const.go
@@ -6,8 +6,8 @@
"fmt"
"strconv"
- "v.io/core/veyron/lib/vdl/codegen"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/codegen"
)
// TypedConst returns the explicitly-typed vdl const corresponding to v, in the
diff --git a/lib/vdl/codegen/vdlgen/import.go b/lib/vdl/codegen/vdlgen/import.go
index 172aad7..e02b07c 100644
--- a/lib/vdl/codegen/vdlgen/import.go
+++ b/lib/vdl/codegen/vdlgen/import.go
@@ -4,7 +4,7 @@
// TODO(toddw): Add tests
import (
- "v.io/core/veyron/lib/vdl/codegen"
+ "v.io/x/ref/lib/vdl/codegen"
)
// Imports returns the vdl imports clause corresponding to imports; empty if
diff --git a/lib/vdl/codegen/vdlgen/type.go b/lib/vdl/codegen/vdlgen/type.go
index 28d6ae1..33e6169 100644
--- a/lib/vdl/codegen/vdlgen/type.go
+++ b/lib/vdl/codegen/vdlgen/type.go
@@ -6,8 +6,8 @@
"fmt"
"strings"
- "v.io/core/veyron/lib/vdl/codegen"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/codegen"
)
// Type returns t using VDL syntax, returning the qualified name if t is named,
diff --git a/lib/vdl/compile/compile.go b/lib/vdl/compile/compile.go
index 85e82af..fb07047 100644
--- a/lib/vdl/compile/compile.go
+++ b/lib/vdl/compile/compile.go
@@ -21,9 +21,9 @@
"path/filepath"
"sort"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/parse"
)
// CompilePackage compiles a list of parse.Files into a Package. Updates env
diff --git a/lib/vdl/compile/compile_test.go b/lib/vdl/compile/compile_test.go
index 2b90aaa..66e1831 100644
--- a/lib/vdl/compile/compile_test.go
+++ b/lib/vdl/compile/compile_test.go
@@ -6,9 +6,9 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestValidExportedIdent(t *testing.T) {
diff --git a/lib/vdl/compile/const.go b/lib/vdl/compile/const.go
index c749881..1e151ea 100644
--- a/lib/vdl/compile/const.go
+++ b/lib/vdl/compile/const.go
@@ -4,10 +4,10 @@
"fmt"
"math/big"
- "v.io/core/veyron/lib/vdl/opconst"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
"v.io/x/lib/toposort"
+ "v.io/x/ref/lib/vdl/opconst"
+ "v.io/x/ref/lib/vdl/parse"
)
// ConstDef represents a user-defined named const definition in the compiled
diff --git a/lib/vdl/compile/const_test.go b/lib/vdl/compile/const_test.go
index 7da4f05..1239cae 100644
--- a/lib/vdl/compile/const_test.go
+++ b/lib/vdl/compile/const_test.go
@@ -5,10 +5,10 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func testConstPackage(t *testing.T, name string, tpkg constPkg, env *compile.Env) *compile.Package {
diff --git a/lib/vdl/compile/error.go b/lib/vdl/compile/error.go
index cbe92b1..cf19df5 100644
--- a/lib/vdl/compile/error.go
+++ b/lib/vdl/compile/error.go
@@ -5,9 +5,9 @@
"regexp"
"strconv"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/i18n"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/parse"
)
// ErrorDef represents a user-defined error definition in the compiled results.
diff --git a/lib/vdl/compile/error_test.go b/lib/vdl/compile/error_test.go
index 28bfc83..ea46a5d 100644
--- a/lib/vdl/compile/error_test.go
+++ b/lib/vdl/compile/error_test.go
@@ -4,12 +4,12 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/i18n"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestError(t *testing.T) {
diff --git a/lib/vdl/compile/ident_test.go b/lib/vdl/compile/ident_test.go
index b2636f3..73bc059 100644
--- a/lib/vdl/compile/ident_test.go
+++ b/lib/vdl/compile/ident_test.go
@@ -3,9 +3,9 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestIdentConflict(t *testing.T) {
diff --git a/lib/vdl/compile/interface.go b/lib/vdl/compile/interface.go
index 66dd3f6..a1f0962 100644
--- a/lib/vdl/compile/interface.go
+++ b/lib/vdl/compile/interface.go
@@ -1,9 +1,9 @@
package compile
import (
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
"v.io/x/lib/toposort"
+ "v.io/x/ref/lib/vdl/parse"
)
// compileInterfaces is the "entry point" to the rest of this file. It takes
diff --git a/lib/vdl/compile/interface_test.go b/lib/vdl/compile/interface_test.go
index c1ec8f9..bde66a9 100644
--- a/lib/vdl/compile/interface_test.go
+++ b/lib/vdl/compile/interface_test.go
@@ -4,11 +4,11 @@
"reflect"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdltest"
)
func TestInterface(t *testing.T) {
diff --git a/lib/vdl/compile/reserved_words.go b/lib/vdl/compile/reserved_words.go
index 0ca0f69..e73b9d3 100644
--- a/lib/vdl/compile/reserved_words.go
+++ b/lib/vdl/compile/reserved_words.go
@@ -1,7 +1,7 @@
package compile
import (
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// ReservedMode indicates which mode to perform reserved-word checking:
diff --git a/lib/vdl/compile/result.go b/lib/vdl/compile/result.go
index 6545d45..dc34b7c 100644
--- a/lib/vdl/compile/result.go
+++ b/lib/vdl/compile/result.go
@@ -6,11 +6,11 @@
"regexp"
"strings"
- "v.io/core/veyron/lib/vdl/opconst"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdlutil"
"v.io/v23/vdl"
"v.io/v23/vdlroot/vdltool"
+ "v.io/x/ref/lib/vdl/opconst"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// Env is the environment for compilation. It contains all errors that were
diff --git a/lib/vdl/compile/type.go b/lib/vdl/compile/type.go
index 3ab1a3f..46c9f77 100644
--- a/lib/vdl/compile/type.go
+++ b/lib/vdl/compile/type.go
@@ -3,8 +3,8 @@
import (
"fmt"
- "v.io/core/veyron/lib/vdl/parse"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/parse"
)
// TypeDef represents a user-defined named type definition in the compiled
diff --git a/lib/vdl/compile/type_test.go b/lib/vdl/compile/type_test.go
index 77a2a23..8569e4d 100644
--- a/lib/vdl/compile/type_test.go
+++ b/lib/vdl/compile/type_test.go
@@ -3,10 +3,10 @@
import (
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/compile"
- "v.io/core/veyron/lib/vdl/vdltest"
"v.io/v23/vdl"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/compile"
+ "v.io/x/ref/lib/vdl/vdltest"
)
const qual = "package path qualified identifier"
diff --git a/lib/vdl/parse/parse.go b/lib/vdl/parse/parse.go
index 77d8710..ba89984 100644
--- a/lib/vdl/parse/parse.go
+++ b/lib/vdl/parse/parse.go
@@ -20,7 +20,7 @@
"strings"
"text/scanner"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// Opts specifies vdl parsing options.
diff --git a/lib/vdl/parse/parse_test.go b/lib/vdl/parse/parse_test.go
index f633243..5ee99f5 100644
--- a/lib/vdl/parse/parse_test.go
+++ b/lib/vdl/parse/parse_test.go
@@ -8,9 +8,9 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/parse"
- "v.io/core/veyron/lib/vdl/vdltest"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/parse"
+ "v.io/x/ref/lib/vdl/vdltest"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
func pos(line, col int) parse.Pos {
diff --git a/lib/vdl/parse/result.go b/lib/vdl/parse/result.go
index dd5281e..6f2fb9b 100644
--- a/lib/vdl/parse/result.go
+++ b/lib/vdl/parse/result.go
@@ -6,7 +6,7 @@
"strconv"
"strings"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// Pos captures positional information during parsing.
diff --git a/lib/vdl/testdata/arith/advanced.vdl b/lib/vdl/testdata/arith/advanced.vdl
index a89403a..8d676a4 100644
--- a/lib/vdl/testdata/arith/advanced.vdl
+++ b/lib/vdl/testdata/arith/advanced.vdl
@@ -1,7 +1,7 @@
package arith
import (
- "v.io/core/veyron/lib/vdl/testdata/arith/exp"
+ "v.io/x/ref/lib/vdl/testdata/arith/exp"
)
// Trigonometry is an interface that specifies a couple trigonometric functions.
diff --git a/lib/vdl/testdata/arith/advanced.vdl.go b/lib/vdl/testdata/arith/advanced.vdl.go
index de93308..c972c21 100644
--- a/lib/vdl/testdata/arith/advanced.vdl.go
+++ b/lib/vdl/testdata/arith/advanced.vdl.go
@@ -10,7 +10,7 @@
"v.io/v23/ipc"
// VDL user imports
- "v.io/core/veyron/lib/vdl/testdata/arith/exp"
+ "v.io/x/ref/lib/vdl/testdata/arith/exp"
)
// TrigonometryClientMethods is the client interface
@@ -135,7 +135,7 @@
// descTrigonometry hides the desc to keep godoc clean.
var descTrigonometry = ipc.InterfaceDesc{
Name: "Trigonometry",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// Trigonometry is an interface that specifies a couple trigonometric functions.",
Methods: []ipc.MethodDesc{
{
@@ -270,10 +270,10 @@
// descAdvancedMath hides the desc to keep godoc clean.
var descAdvancedMath = ipc.InterfaceDesc{
Name: "AdvancedMath",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// AdvancedMath is an interface for more advanced math than arith. It embeds\n// interfaces defined both in the same file and in an external package; and in\n// turn it is embedded by arith.Calculator (which is in the same package but\n// different file) to verify that embedding works in all these scenarios.",
Embeds: []ipc.EmbedDesc{
- {"Trigonometry", "v.io/core/veyron/lib/vdl/testdata/arith", "// Trigonometry is an interface that specifies a couple trigonometric functions."},
- {"Exp", "v.io/core/veyron/lib/vdl/testdata/arith/exp", ``},
+ {"Trigonometry", "v.io/x/ref/lib/vdl/testdata/arith", "// Trigonometry is an interface that specifies a couple trigonometric functions."},
+ {"Exp", "v.io/x/ref/lib/vdl/testdata/arith/exp", ``},
},
}
diff --git a/lib/vdl/testdata/arith/arith.vdl b/lib/vdl/testdata/arith/arith.vdl
index 8cfc3be..2554222 100644
--- a/lib/vdl/testdata/arith/arith.vdl
+++ b/lib/vdl/testdata/arith/arith.vdl
@@ -25,7 +25,7 @@
// Test the import mechanism.
import (
- "v.io/core/veyron/lib/vdl/testdata/base"
+ "v.io/x/ref/lib/vdl/testdata/base"
)
// Constants.
diff --git a/lib/vdl/testdata/arith/arith.vdl.go b/lib/vdl/testdata/arith/arith.vdl.go
index 6df5088..e8324e1 100644
--- a/lib/vdl/testdata/arith/arith.vdl.go
+++ b/lib/vdl/testdata/arith/arith.vdl.go
@@ -35,8 +35,8 @@
"v.io/v23/vdl"
// VDL user imports
- "v.io/core/veyron/lib/vdl/testdata/arith/exp"
- "v.io/core/veyron/lib/vdl/testdata/base"
+ "v.io/x/ref/lib/vdl/testdata/arith/exp"
+ "v.io/x/ref/lib/vdl/testdata/base"
)
// Yes shows that bools may be untyped.
@@ -491,7 +491,7 @@
// descArith hides the desc to keep godoc clean.
var descArith = ipc.InterfaceDesc{
Name: "Arith",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Doc: "// Arith is an example of an interface definition for an arithmetic service.\n// Things to note:\n// * There must be at least 1 out-arg, and the last out-arg must be error.",
Methods: []ipc.MethodDesc{
{
@@ -851,10 +851,10 @@
// descCalculator hides the desc to keep godoc clean.
var descCalculator = ipc.InterfaceDesc{
Name: "Calculator",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith",
Embeds: []ipc.EmbedDesc{
- {"Arith", "v.io/core/veyron/lib/vdl/testdata/arith", "// Arith is an example of an interface definition for an arithmetic service.\n// Things to note:\n// * There must be at least 1 out-arg, and the last out-arg must be error."},
- {"AdvancedMath", "v.io/core/veyron/lib/vdl/testdata/arith", "// AdvancedMath is an interface for more advanced math than arith. It embeds\n// interfaces defined both in the same file and in an external package; and in\n// turn it is embedded by arith.Calculator (which is in the same package but\n// different file) to verify that embedding works in all these scenarios."},
+ {"Arith", "v.io/x/ref/lib/vdl/testdata/arith", "// Arith is an example of an interface definition for an arithmetic service.\n// Things to note:\n// * There must be at least 1 out-arg, and the last out-arg must be error."},
+ {"AdvancedMath", "v.io/x/ref/lib/vdl/testdata/arith", "// AdvancedMath is an interface for more advanced math than arith. It embeds\n// interfaces defined both in the same file and in an external package; and in\n// turn it is embedded by arith.Calculator (which is in the same package but\n// different file) to verify that embedding works in all these scenarios."},
},
Methods: []ipc.MethodDesc{
{
diff --git a/lib/vdl/testdata/arith/exp/exp.vdl.go b/lib/vdl/testdata/arith/exp/exp.vdl.go
index 07f15ee..a808cbc 100644
--- a/lib/vdl/testdata/arith/exp/exp.vdl.go
+++ b/lib/vdl/testdata/arith/exp/exp.vdl.go
@@ -115,7 +115,7 @@
// descExp hides the desc to keep godoc clean.
var descExp = ipc.InterfaceDesc{
Name: "Exp",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/arith/exp",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/arith/exp",
Methods: []ipc.MethodDesc{
{
Name: "Exp",
diff --git a/lib/vdl/testdata/base/base.vdl.go b/lib/vdl/testdata/base/base.vdl.go
index 820c537..f3f0124 100644
--- a/lib/vdl/testdata/base/base.vdl.go
+++ b/lib/vdl/testdata/base/base.vdl.go
@@ -19,91 +19,91 @@
type NamedBool bool
func (NamedBool) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedBool"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedBool"
}) {
}
type NamedByte byte
func (NamedByte) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedByte"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedByte"
}) {
}
type NamedUint16 uint16
func (NamedUint16) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUint16"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUint16"
}) {
}
type NamedUint32 uint32
func (NamedUint32) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUint32"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUint32"
}) {
}
type NamedUint64 uint64
func (NamedUint64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUint64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUint64"
}) {
}
type NamedInt16 int16
func (NamedInt16) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedInt16"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedInt16"
}) {
}
type NamedInt32 int32
func (NamedInt32) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedInt32"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedInt32"
}) {
}
type NamedInt64 int64
func (NamedInt64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedInt64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedInt64"
}) {
}
type NamedFloat32 float32
func (NamedFloat32) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedFloat32"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedFloat32"
}) {
}
type NamedFloat64 float64
func (NamedFloat64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedFloat64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedFloat64"
}) {
}
type NamedComplex64 complex64
func (NamedComplex64) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedComplex64"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedComplex64"
}) {
}
type NamedComplex128 complex128
func (NamedComplex128) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedComplex128"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedComplex128"
}) {
}
type NamedString string
func (NamedString) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedString"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedString"
}) {
}
@@ -155,7 +155,7 @@
}
func (NamedEnum) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedEnum"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedEnum"
Enum struct{ A, B, C string }
}) {
}
@@ -163,28 +163,28 @@
type NamedArray [2]bool
func (NamedArray) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedArray"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedArray"
}) {
}
type NamedList []uint32
func (NamedList) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedList"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedList"
}) {
}
type NamedSet map[string]struct{}
func (NamedSet) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedSet"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedSet"
}) {
}
type NamedMap map[string]float32
func (NamedMap) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedMap"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedMap"
}) {
}
@@ -195,7 +195,7 @@
}
func (NamedStruct) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedStruct"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedStruct"
}) {
}
@@ -219,7 +219,7 @@
NamedUnionC struct{ Value int32 }
// __NamedUnionReflect describes the NamedUnion union type.
__NamedUnionReflect struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NamedUnion"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NamedUnion"
Type NamedUnion
Union struct {
A NamedUnionA
@@ -279,7 +279,7 @@
}
func (Scalars) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.Scalars"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.Scalars"
}) {
}
@@ -314,14 +314,14 @@
}
func (KeyScalars) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.KeyScalars"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.KeyScalars"
}) {
}
type ScalarsArray [2]Scalars
func (ScalarsArray) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.ScalarsArray"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.ScalarsArray"
}) {
}
@@ -335,14 +335,14 @@
}
func (Composites) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.Composites"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.Composites"
}) {
}
type CompositesArray [2]Composites
func (CompositesArray) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.CompositesArray"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.CompositesArray"
}) {
}
@@ -355,7 +355,7 @@
}
func (CompComp) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.CompComp"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.CompComp"
}) {
}
@@ -367,7 +367,7 @@
}
func (NestedArgs) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.NestedArgs"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.NestedArgs"
}) {
}
@@ -378,7 +378,7 @@
}
func (Args) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/base.Args"
+ Name string "v.io/x/ref/lib/vdl/testdata/base.Args"
}) {
}
@@ -557,11 +557,11 @@
var CTOAny = vdl.AnyType
var (
- ErrNoParams1 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.NoParams1", verror.NoRetry, "{1:}{2:} en msg")
- ErrNoParams2 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.NoParams2", verror.RetryRefetch, "{1:}{2:} en msg")
- ErrWithParams1 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.WithParams1", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
- ErrWithParams2 = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.WithParams2", verror.RetryRefetch, "{1:}{2:} en x={3} y={4}")
- errNotExported = verror.Register("v.io/core/veyron/lib/vdl/testdata/base.notExported", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
+ ErrNoParams1 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.NoParams1", verror.NoRetry, "{1:}{2:} en msg")
+ ErrNoParams2 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.NoParams2", verror.RetryRefetch, "{1:}{2:} en msg")
+ ErrWithParams1 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.WithParams1", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
+ ErrWithParams2 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.WithParams2", verror.RetryRefetch, "{1:}{2:} en x={3} y={4}")
+ errNotExported = verror.Register("v.io/x/ref/lib/vdl/testdata/base.notExported", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
)
func init() {
@@ -923,7 +923,7 @@
// descServiceA hides the desc to keep godoc clean.
var descServiceA = ipc.InterfaceDesc{
Name: "ServiceA",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/base",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/base",
Methods: []ipc.MethodDesc{
{
Name: "MethodA1",
@@ -1196,9 +1196,9 @@
// descServiceB hides the desc to keep godoc clean.
var descServiceB = ipc.InterfaceDesc{
Name: "ServiceB",
- PkgPath: "v.io/core/veyron/lib/vdl/testdata/base",
+ PkgPath: "v.io/x/ref/lib/vdl/testdata/base",
Embeds: []ipc.EmbedDesc{
- {"ServiceA", "v.io/core/veyron/lib/vdl/testdata/base", ``},
+ {"ServiceA", "v.io/x/ref/lib/vdl/testdata/base", ``},
},
Methods: []ipc.MethodDesc{
{
diff --git a/lib/vdl/testdata/nativedep/nativedep.vdl b/lib/vdl/testdata/nativedep/nativedep.vdl
index 8715050..de10fe8 100644
--- a/lib/vdl/testdata/nativedep/nativedep.vdl
+++ b/lib/vdl/testdata/nativedep/nativedep.vdl
@@ -1,6 +1,6 @@
package nativedep
-import "v.io/core/veyron/lib/vdl/testdata/nativetest"
+import "v.io/x/ref/lib/vdl/testdata/nativetest"
type All struct {
A nativetest.WireString
diff --git a/lib/vdl/testdata/nativedep/nativedep.vdl.go b/lib/vdl/testdata/nativedep/nativedep.vdl.go
index ded3c95..ac88410 100644
--- a/lib/vdl/testdata/nativedep/nativedep.vdl.go
+++ b/lib/vdl/testdata/nativedep/nativedep.vdl.go
@@ -9,7 +9,7 @@
// VDL user imports
"time"
- _ "v.io/core/veyron/lib/vdl/testdata/nativetest"
+ _ "v.io/x/ref/lib/vdl/testdata/nativetest"
"v.io/v23/vdl/testdata/nativetest"
)
@@ -22,7 +22,7 @@
}
func (All) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativedep.All"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativedep.All"
}) {
}
diff --git a/lib/vdl/testdata/nativedep2/nativedep2.vdl b/lib/vdl/testdata/nativedep2/nativedep2.vdl
index f28e5d1..c9a3553 100644
--- a/lib/vdl/testdata/nativedep2/nativedep2.vdl
+++ b/lib/vdl/testdata/nativedep2/nativedep2.vdl
@@ -4,11 +4,11 @@
// imports right. In particular, the generated file has no code dependencies on
// nativetest, but should have two imports:
// "time"
-// _ "v.io/core/veyron/lib/vdl/testdata/nativetest"
+// _ "v.io/x/ref/lib/vdl/testdata/nativetest"
//
// The underscore dependency is added to ensure that nativetest.WireTime is
// registered whenever this package is used, so that the WireTime<->time.Time
// mapping is known by the vdl package.
-import "v.io/core/veyron/lib/vdl/testdata/nativetest"
+import "v.io/x/ref/lib/vdl/testdata/nativetest"
type MyTime nativetest.WireTime
diff --git a/lib/vdl/testdata/nativedep2/nativedep2.vdl.go b/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
index d081408..719dd40 100644
--- a/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
+++ b/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
@@ -9,13 +9,13 @@
// VDL user imports
"time"
- _ "v.io/core/veyron/lib/vdl/testdata/nativetest"
+ _ "v.io/x/ref/lib/vdl/testdata/nativetest"
)
type MyTime time.Time
func (MyTime) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativedep2.MyTime"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativedep2.MyTime"
}) {
}
diff --git a/lib/vdl/testdata/nativetest/nativetest.vdl.go b/lib/vdl/testdata/nativetest/nativetest.vdl.go
index f9bdc99..878d370 100644
--- a/lib/vdl/testdata/nativetest/nativetest.vdl.go
+++ b/lib/vdl/testdata/nativetest/nativetest.vdl.go
@@ -16,35 +16,35 @@
type WireString int32
func (WireString) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireString"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireString"
}) {
}
type WireMapStringInt int32
func (WireMapStringInt) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireMapStringInt"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt"
}) {
}
type WireTime int32
func (WireTime) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireTime"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireTime"
}) {
}
type WireSamePkg int32
func (WireSamePkg) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireSamePkg"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg"
}) {
}
type WireMultiImport int32
func (WireMultiImport) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireMultiImport"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport"
}) {
}
@@ -57,7 +57,7 @@
}
func (WireAll) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.WireAll"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.WireAll"
}) {
}
diff --git a/lib/vdl/testdata/nativetest/otherfile.vdl.go b/lib/vdl/testdata/nativetest/otherfile.vdl.go
index c56c1f1..301f84a 100644
--- a/lib/vdl/testdata/nativetest/otherfile.vdl.go
+++ b/lib/vdl/testdata/nativetest/otherfile.vdl.go
@@ -15,7 +15,7 @@
type ignoreme string
func (ignoreme) __VDLReflect(struct {
- Name string "v.io/core/veyron/lib/vdl/testdata/nativetest.ignoreme"
+ Name string "v.io/x/ref/lib/vdl/testdata/nativetest.ignoreme"
}) {
}
diff --git a/lib/vdl/vdltest/vdltest.go b/lib/vdl/vdltest/vdltest.go
index 7dc5c41..36e3841 100644
--- a/lib/vdl/vdltest/vdltest.go
+++ b/lib/vdl/vdltest/vdltest.go
@@ -8,8 +8,8 @@
"strings"
"testing"
- "v.io/core/veyron/lib/vdl/build"
- "v.io/core/veyron/lib/vdl/vdlutil"
+ "v.io/x/ref/lib/vdl/build"
+ "v.io/x/ref/lib/vdl/vdlutil"
)
// ExpectPass makes sure errs has no errors.
diff --git a/lib/websocket/dialer.go b/lib/websocket/dialer.go
index 8b76f3e..02ea6c6 100644
--- a/lib/websocket/dialer.go
+++ b/lib/websocket/dialer.go
@@ -10,7 +10,7 @@
"github.com/gorilla/websocket"
- "v.io/core/veyron/lib/tcputil"
+ "v.io/x/ref/lib/tcputil"
)
func Dial(protocol, address string, timeout time.Duration) (net.Conn, error) {
diff --git a/lib/websocket/hybrid.go b/lib/websocket/hybrid.go
index 77f11b2..9928e30 100644
--- a/lib/websocket/hybrid.go
+++ b/lib/websocket/hybrid.go
@@ -4,7 +4,7 @@
"net"
"time"
- "v.io/core/veyron/lib/tcputil"
+ "v.io/x/ref/lib/tcputil"
)
// TODO(jhahn): Figure out a way for this mapping to be shared.
diff --git a/lib/websocket/listener.go b/lib/websocket/listener.go
index 8405a39..e2a9476 100644
--- a/lib/websocket/listener.go
+++ b/lib/websocket/listener.go
@@ -14,8 +14,8 @@
"v.io/x/lib/vlog"
- "v.io/core/veyron/lib/tcputil"
- "v.io/core/veyron/runtimes/google/lib/upcqueue"
+ "v.io/x/ref/lib/tcputil"
+ "v.io/x/ref/runtimes/google/lib/upcqueue"
)
var errListenerIsClosed = errors.New("Listener has been Closed")
diff --git a/lib/websocket/v23_internal_test.go b/lib/websocket/v23_internal_test.go
index 25cc4a5..f942dfa 100644
--- a/lib/websocket/v23_internal_test.go
+++ b/lib/websocket/v23_internal_test.go
@@ -9,7 +9,7 @@
import "testing"
import "os"
-import "v.io/core/veyron/lib/testutil"
+import "v.io/x/ref/lib/testutil"
func TestMain(m *testing.M) {
testutil.Init()
diff --git a/lib/websocket/ws_test.go b/lib/websocket/ws_test.go
index 172a68d..97d59da 100644
--- a/lib/websocket/ws_test.go
+++ b/lib/websocket/ws_test.go
@@ -7,7 +7,7 @@
"v.io/v23/ipc"
- "v.io/core/veyron/lib/websocket"
+ "v.io/x/ref/lib/websocket"
)
func packetTester(t *testing.T, dialer ipc.DialerFunc, listener ipc.ListenerFunc, txProtocol, rxProtocol string) {
