veyron/vdl: Merge vdl/valconv into the vdl package.
Additional CLs will perform minor renaming of functions, and will
unexport types and functions that no longer need to be exported.
Change-Id: Ia84e0bf9f78138920f672a12a7997db61073cfe7
diff --git a/runtimes/google/testing/mocks/ipc/simple_client.go b/runtimes/google/testing/mocks/ipc/simple_client.go
index 7ce530b..20235fb 100644
--- a/runtimes/google/testing/mocks/ipc/simple_client.go
+++ b/runtimes/google/testing/mocks/ipc/simple_client.go
@@ -8,7 +8,7 @@
"v.io/core/veyron2/context"
"v.io/core/veyron2/ipc"
"v.io/core/veyron2/security"
- "v.io/core/veyron2/vdl/valconv"
+ "v.io/core/veyron2/vdl"
"v.io/core/veyron2/vlog"
"v.io/core/veyron2/vom"
)
@@ -106,7 +106,7 @@
}
for ax, res := range resultptrs {
if mc.results[ax] != nil {
- if err := valconv.Convert(res, mc.results[ax]); err != nil {
+ if err := vdl.Convert(res, mc.results[ax]); err != nil {
panic(fmt.Sprintf("Error converting out argument %#v: %v", mc.results[ax], err))
}
}
