veyron/tools: Merge the impl and main packages
This change gets rid of the impl packages and moves the impl.go files to
the main package for each tool under veyron/tools/.
Change-Id: Ieae4bc1dd02296f58f8cb6327b903d025cf833f5
diff --git a/tools/build/impl/impl.go b/tools/build/impl.go
similarity index 98%
rename from tools/build/impl/impl.go
rename to tools/build/impl.go
index 6126bfc..d047478 100644
--- a/tools/build/impl/impl.go
+++ b/tools/build/impl.go
@@ -1,4 +1,4 @@
-package impl
+package main
import (
"fmt"
@@ -36,8 +36,8 @@
Children: []*cmdline.Command{cmdBuild},
}
-// Root returns a command that represents the root of the veyron tool.
-func Root() *cmdline.Command {
+// root returns a command that represents the root of the veyron tool.
+func root() *cmdline.Command {
return cmdRoot
}
diff --git a/tools/build/impl/impl_test.go b/tools/build/impl_test.go
similarity index 96%
rename from tools/build/impl/impl_test.go
rename to tools/build/impl_test.go
index 6d120b9..15ef3eb 100644
--- a/tools/build/impl/impl_test.go
+++ b/tools/build/impl_test.go
@@ -1,4 +1,4 @@
-package impl_test
+package main
import (
"bytes"
@@ -14,7 +14,6 @@
"veyron.io/veyron/veyron2/vlog"
"veyron.io/veyron/veyron/profiles"
- "veyron.io/veyron/veyron/tools/build/impl"
)
var errInternalError = verror.Internalf("internal error")
@@ -67,7 +66,7 @@
server, endpoint := startServer(t)
defer stopServer(t, server)
- cmd := impl.Root()
+ cmd := root()
var stdout, stderr bytes.Buffer
cmd.Init(nil, &stdout, &stderr)
diff --git a/tools/build/main.go b/tools/build/main.go
index 6b96081..a99a159 100644
--- a/tools/build/main.go
+++ b/tools/build/main.go
@@ -13,12 +13,9 @@
"veyron.io/veyron/veyron2/rt"
_ "veyron.io/veyron/veyron/profiles"
- "veyron.io/veyron/veyron/tools/build/impl"
)
func main() {
- r := rt.Init()
- defer r.Cleanup()
-
- impl.Root().Main()
+ defer rt.Init().Cleanup()
+ root().Main()
}
