v23: Updated vdl files for 2 pass gen
MultiPart: 2/9
Change-Id: Ie4fbf72b9ee6771d944f77ca3103190366901547
diff --git a/discovery/types.vdl.go b/discovery/types.vdl.go
index b9fd56d..582eb42 100644
--- a/discovery/types.vdl.go
+++ b/discovery/types.vdl.go
@@ -8,7 +8,6 @@
package discovery
import (
- // VDL system imports
"v.io/v23/vdl"
)
diff --git a/flow/errors.vdl.go b/flow/errors.vdl.go
index af2aaa9..d7cf1f5 100644
--- a/flow/errors.vdl.go
+++ b/flow/errors.vdl.go
@@ -8,7 +8,6 @@
package flow
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/verror"
diff --git a/flow/message/errors.vdl.go b/flow/message/errors.vdl.go
index 8762045..f9b269f 100644
--- a/flow/message/errors.vdl.go
+++ b/flow/message/errors.vdl.go
@@ -8,7 +8,6 @@
package message
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/verror"
diff --git a/naming/types.vdl.go b/naming/types.vdl.go
index 7870e5a..b02315e 100644
--- a/naming/types.vdl.go
+++ b/naming/types.vdl.go
@@ -8,12 +8,9 @@
package naming
import (
- // VDL system imports
"v.io/v23/vdl"
- "v.io/v23/verror"
-
- // VDL user imports
"v.io/v23/vdlroot/time"
+ "v.io/v23/verror"
)
// MountFlag is a bit mask of options to the mount call.
diff --git a/query/engine/internal/testdata/db_objects.vdl.go b/query/engine/internal/testdata/db_objects.vdl.go
index a070e41..fce16f8 100644
--- a/query/engine/internal/testdata/db_objects.vdl.go
+++ b/query/engine/internal/testdata/db_objects.vdl.go
@@ -8,12 +8,9 @@
package testdata
import (
- // VDL system imports
"fmt"
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
diff --git a/query/syncql/errors.vdl.go b/query/syncql/errors.vdl.go
index d7bd434..af265bf 100644
--- a/query/syncql/errors.vdl.go
+++ b/query/syncql/errors.vdl.go
@@ -8,7 +8,6 @@
package syncql
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/verror"
diff --git a/rpc/protocol.vdl.go b/rpc/protocol.vdl.go
index 0454c14..b91929f 100644
--- a/rpc/protocol.vdl.go
+++ b/rpc/protocol.vdl.go
@@ -8,13 +8,10 @@
package rpc
import (
- // VDL system imports
- "v.io/v23/vdl"
- "v.io/v23/verror"
-
- // VDL user imports
"v.io/v23/security"
+ "v.io/v23/vdl"
"v.io/v23/vdlroot/time"
+ "v.io/v23/verror"
"v.io/v23/vtrace"
)
diff --git a/rpc/reserved/types.vdl.go b/rpc/reserved/types.vdl.go
index 1cfb2c5..91d2636 100644
--- a/rpc/reserved/types.vdl.go
+++ b/rpc/reserved/types.vdl.go
@@ -8,7 +8,6 @@
package reserved
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/verror"
diff --git a/rpc/version/errors.vdl.go b/rpc/version/errors.vdl.go
index 56e7d48..d58f7e0 100644
--- a/rpc/version/errors.vdl.go
+++ b/rpc/version/errors.vdl.go
@@ -8,7 +8,6 @@
package version
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/verror"
diff --git a/security/access/internal/vdl.vdl.go b/security/access/internal/vdl.vdl.go
index 55aeef5..ec0f893 100644
--- a/security/access/internal/vdl.vdl.go
+++ b/security/access/internal/vdl.vdl.go
@@ -10,7 +10,6 @@
package internal
import (
- // VDL system imports
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
diff --git a/security/access/types.vdl.go b/security/access/types.vdl.go
index 5c3b23a..48ed686 100644
--- a/security/access/types.vdl.go
+++ b/security/access/types.vdl.go
@@ -103,15 +103,12 @@
package access
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
- "v.io/v23/vdl"
- "v.io/v23/verror"
-
- // VDL user imports
"v.io/v23/security"
"v.io/v23/uniqueid"
+ "v.io/v23/vdl"
+ "v.io/v23/verror"
)
// AccessList represents a set of blessings that should be granted access.
diff --git a/security/caveat.vdl.go b/security/caveat.vdl.go
index bc77fbc..ba57dfc 100644
--- a/security/caveat.vdl.go
+++ b/security/caveat.vdl.go
@@ -8,16 +8,13 @@
package security
import (
- // VDL system imports
+ "time"
"v.io/v23/context"
"v.io/v23/i18n"
- "v.io/v23/vdl"
- "v.io/v23/verror"
-
- // VDL user imports
- "time"
"v.io/v23/uniqueid"
+ "v.io/v23/vdl"
_ "v.io/v23/vdlroot/time"
+ "v.io/v23/verror"
)
type nonce [16]byte
diff --git a/security/types.vdl.go b/security/types.vdl.go
index f7e9b85..53d9784 100644
--- a/security/types.vdl.go
+++ b/security/types.vdl.go
@@ -8,15 +8,12 @@
package security
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
+ "v.io/v23/uniqueid"
"v.io/v23/vdl"
"v.io/v23/verror"
"v.io/v23/vom"
-
- // VDL user imports
- "v.io/v23/uniqueid"
)
// BlessingPattern is a pattern that is matched by specific blessings.
diff --git a/services/appcycle/appcycle.vdl.go b/services/appcycle/appcycle.vdl.go
index a0088b9..b5f2e40 100644
--- a/services/appcycle/appcycle.vdl.go
+++ b/services/appcycle/appcycle.vdl.go
@@ -9,7 +9,6 @@
package appcycle
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
diff --git a/services/application/application.vdl.go b/services/application/application.vdl.go
index 1520f43..7a9e930 100644
--- a/services/application/application.vdl.go
+++ b/services/application/application.vdl.go
@@ -9,12 +9,9 @@
package application
import (
- // VDL system imports
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
"v.io/v23/security"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
diff --git a/services/binary/binary.vdl.go b/services/binary/binary.vdl.go
index c4240d7..2f00f6e 100644
--- a/services/binary/binary.vdl.go
+++ b/services/binary/binary.vdl.go
@@ -9,7 +9,6 @@
package binary
import (
- // VDL system imports
"v.io/v23/vdl"
)
diff --git a/services/build/build.vdl.go b/services/build/build.vdl.go
index 2e28345..cdce3e0 100644
--- a/services/build/build.vdl.go
+++ b/services/build/build.vdl.go
@@ -9,16 +9,13 @@
package build
import (
- // VDL system imports
"fmt"
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/services/binary"
+ "v.io/v23/vdl"
)
// Architecture specifies the hardware architecture of a host.
diff --git a/services/device/device.vdl.go b/services/device/device.vdl.go
index 48c5ddf..9004151 100644
--- a/services/device/device.vdl.go
+++ b/services/device/device.vdl.go
@@ -10,22 +10,19 @@
package device
import (
- // VDL system imports
"fmt"
"io"
+ "time"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
- "time"
"v.io/v23/security"
"v.io/v23/security/access"
"v.io/v23/services/application"
"v.io/v23/services/binary"
"v.io/v23/services/permissions"
"v.io/v23/services/tidyable"
+ "v.io/v23/vdl"
_ "v.io/v23/vdlroot/time"
)
diff --git a/services/groups/groups.vdl.go b/services/groups/groups.vdl.go
index b414b3c..a12a0ac 100644
--- a/services/groups/groups.vdl.go
+++ b/services/groups/groups.vdl.go
@@ -10,18 +10,15 @@
package groups
import (
- // VDL system imports
"fmt"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/rpc"
- "v.io/v23/vdl"
- "v.io/v23/verror"
-
- // VDL user imports
"v.io/v23/security/access"
"v.io/v23/services/permissions"
+ "v.io/v23/vdl"
+ "v.io/v23/verror"
)
// BlessingPatternChunk is a substring of a BlessingPattern. As with
diff --git a/services/logreader/logreader.vdl.go b/services/logreader/logreader.vdl.go
index 6f9de48..ad89ae6 100644
--- a/services/logreader/logreader.vdl.go
+++ b/services/logreader/logreader.vdl.go
@@ -9,15 +9,12 @@
package logreader
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/security/access"
+ "v.io/v23/vdl"
)
// LogEntry is a log entry from a log file.
diff --git a/services/mounttable/service.vdl.go b/services/mounttable/service.vdl.go
index 5ca88aa..e0e60ab 100644
--- a/services/mounttable/service.vdl.go
+++ b/services/mounttable/service.vdl.go
@@ -19,15 +19,12 @@
package mounttable
import (
- // VDL system imports
"v.io/v23"
"v.io/v23/context"
- "v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/naming"
+ "v.io/v23/rpc"
"v.io/v23/services/permissions"
+ "v.io/v23/vdl"
)
type Tag string
diff --git a/services/permissions/service.vdl.go b/services/permissions/service.vdl.go
index f0056c7..5af07e1 100644
--- a/services/permissions/service.vdl.go
+++ b/services/permissions/service.vdl.go
@@ -10,14 +10,11 @@
package permissions
import (
- // VDL system imports
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/security/access"
+ "v.io/v23/vdl"
)
func __VDLEnsureNativeBuilt_service() {
diff --git a/services/pprof/pprof.vdl.go b/services/pprof/pprof.vdl.go
index 36c59c3..e67ed9f 100644
--- a/services/pprof/pprof.vdl.go
+++ b/services/pprof/pprof.vdl.go
@@ -11,15 +11,12 @@
package pprof
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/security/access"
+ "v.io/v23/vdl"
)
func __VDLEnsureNativeBuilt_pprof() {
diff --git a/services/repository/repository.vdl.go b/services/repository/repository.vdl.go
index ec94e3f..4dd4e39 100644
--- a/services/repository/repository.vdl.go
+++ b/services/repository/repository.vdl.go
@@ -10,19 +10,16 @@
package repository
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/security/access"
"v.io/v23/services/application"
"v.io/v23/services/binary"
"v.io/v23/services/permissions"
"v.io/v23/services/tidyable"
+ "v.io/v23/vdl"
)
// MediaInfo contains the metadata information for a binary.
diff --git a/services/stats/stats.vdl.go b/services/stats/stats.vdl.go
index 1076a67..4a9688e 100644
--- a/services/stats/stats.vdl.go
+++ b/services/stats/stats.vdl.go
@@ -10,18 +10,15 @@
package stats
import (
- // VDL system imports
"v.io/v23"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/rpc"
+ "v.io/v23/security/access"
+ "v.io/v23/services/watch"
"v.io/v23/vdl"
"v.io/v23/verror"
"v.io/v23/vom"
-
- // VDL user imports
- "v.io/v23/security/access"
- "v.io/v23/services/watch"
)
func __VDLEnsureNativeBuilt_stats() {
diff --git a/services/syncbase/nosql/service.vdl.go b/services/syncbase/nosql/service.vdl.go
index d61b097..5a2d892 100644
--- a/services/syncbase/nosql/service.vdl.go
+++ b/services/syncbase/nosql/service.vdl.go
@@ -9,20 +9,17 @@
package nosql
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/rpc"
- "v.io/v23/vdl"
- "v.io/v23/verror"
- "v.io/v23/vom"
-
- // VDL user imports
"v.io/v23/security/access"
"v.io/v23/services/permissions"
"v.io/v23/services/watch"
+ "v.io/v23/vdl"
+ "v.io/v23/verror"
+ "v.io/v23/vom"
)
func __VDLEnsureNativeBuilt_service() {
diff --git a/services/syncbase/nosql/types.vdl.go b/services/syncbase/nosql/types.vdl.go
index c632125..b890cac 100644
--- a/services/syncbase/nosql/types.vdl.go
+++ b/services/syncbase/nosql/types.vdl.go
@@ -8,13 +8,10 @@
package nosql
import (
- // VDL system imports
"fmt"
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
"v.io/v23/security/access"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
diff --git a/services/syncbase/service.vdl.go b/services/syncbase/service.vdl.go
index f50f841..d08e592 100644
--- a/services/syncbase/service.vdl.go
+++ b/services/syncbase/service.vdl.go
@@ -13,19 +13,16 @@
package syncbase
import (
- // VDL system imports
+ "time"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/rpc"
- "v.io/v23/vdl"
- "v.io/v23/verror"
-
- // VDL user imports
- "time"
"v.io/v23/security/access"
"v.io/v23/services/permissions"
+ "v.io/v23/vdl"
_ "v.io/v23/vdlroot/time"
+ "v.io/v23/verror"
)
func __VDLEnsureNativeBuilt_service() {
diff --git a/services/syncbase/types.vdl.go b/services/syncbase/types.vdl.go
index 0f3b6c2..ec3f74e 100644
--- a/services/syncbase/types.vdl.go
+++ b/services/syncbase/types.vdl.go
@@ -8,11 +8,8 @@
package syncbase
import (
- // VDL system imports
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
diff --git a/services/tidyable/service.vdl.go b/services/tidyable/service.vdl.go
index a79d704..1490401 100644
--- a/services/tidyable/service.vdl.go
+++ b/services/tidyable/service.vdl.go
@@ -10,14 +10,11 @@
package tidyable
import (
- // VDL system imports
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/security/access"
+ "v.io/v23/vdl"
)
func __VDLEnsureNativeBuilt_service() {
diff --git a/services/vtrace/vtrace.vdl.go b/services/vtrace/vtrace.vdl.go
index 8fad64e..47b9089 100644
--- a/services/vtrace/vtrace.vdl.go
+++ b/services/vtrace/vtrace.vdl.go
@@ -10,16 +10,13 @@
package vtrace
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
- "v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/security/access"
"v.io/v23/uniqueid"
+ "v.io/v23/vdl"
"v.io/v23/vtrace"
)
diff --git a/services/wakeup/service.vdl.go b/services/wakeup/service.vdl.go
index e26f820..25304a3 100644
--- a/services/wakeup/service.vdl.go
+++ b/services/wakeup/service.vdl.go
@@ -10,7 +10,6 @@
package wakeup
import (
- // VDL system imports
"v.io/v23"
"v.io/v23/context"
"v.io/v23/rpc"
diff --git a/services/watch/service.vdl.go b/services/watch/service.vdl.go
index c926abf..82280b1 100644
--- a/services/watch/service.vdl.go
+++ b/services/watch/service.vdl.go
@@ -108,18 +108,15 @@
package watch
import (
- // VDL system imports
"io"
"v.io/v23"
"v.io/v23/context"
"v.io/v23/i18n"
"v.io/v23/rpc"
+ "v.io/v23/security/access"
"v.io/v23/vdl"
"v.io/v23/verror"
"v.io/v23/vom"
-
- // VDL user imports
- "v.io/v23/security/access"
)
// GlobRequest specifies which entities should be watched and, optionally,
diff --git a/syncbase/nosql/testdata/db_objects.vdl.go b/syncbase/nosql/testdata/db_objects.vdl.go
index f24f680..4f98211 100644
--- a/syncbase/nosql/testdata/db_objects.vdl.go
+++ b/syncbase/nosql/testdata/db_objects.vdl.go
@@ -8,12 +8,9 @@
package testdata
import (
- // VDL system imports
"fmt"
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
diff --git a/syncbase/nosql/types.vdl.go b/syncbase/nosql/types.vdl.go
index 825287a..ccfa9f3 100644
--- a/syncbase/nosql/types.vdl.go
+++ b/syncbase/nosql/types.vdl.go
@@ -8,12 +8,9 @@
package nosql
import (
- // VDL system imports
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
"v.io/v23/services/syncbase/nosql"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
diff --git a/uniqueid/types.vdl.go b/uniqueid/types.vdl.go
index 8322c45..b848013 100644
--- a/uniqueid/types.vdl.go
+++ b/uniqueid/types.vdl.go
@@ -8,7 +8,6 @@
package uniqueid
import (
- // VDL system imports
"v.io/v23/vdl"
)
diff --git a/vdl/builtin.vdl.go b/vdl/builtin.vdl.go
index 2d8ac61..b4225bb 100644
--- a/vdl/builtin.vdl.go
+++ b/vdl/builtin.vdl.go
@@ -8,7 +8,6 @@
package vdl
import (
- // VDL system imports
"fmt"
)
diff --git a/vdlroot/signature/signature.vdl.go b/vdlroot/signature/signature.vdl.go
index 2eae03a..93f96a4 100644
--- a/vdlroot/signature/signature.vdl.go
+++ b/vdlroot/signature/signature.vdl.go
@@ -9,7 +9,6 @@
package signature
import (
- // VDL system imports
"v.io/v23/vdl"
)
diff --git a/vdlroot/time/time.vdl.go b/vdlroot/time/time.vdl.go
index ab017f7..7035f5b 100644
--- a/vdlroot/time/time.vdl.go
+++ b/vdlroot/time/time.vdl.go
@@ -14,11 +14,8 @@
package time
import (
- // VDL system imports
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
+ "v.io/v23/vdl"
)
// Time represents an absolute point in time with up to nanosecond precision.
diff --git a/vdlroot/vdltool/config.vdl.go b/vdlroot/vdltool/config.vdl.go
index 631c0d9..784ab6d 100644
--- a/vdlroot/vdltool/config.vdl.go
+++ b/vdlroot/vdltool/config.vdl.go
@@ -10,7 +10,6 @@
package vdltool
import (
- // VDL system imports
"fmt"
"v.io/v23/vdl"
)
diff --git a/verror/common.vdl.go b/verror/common.vdl.go
index c1767f9..d3d209f 100644
--- a/verror/common.vdl.go
+++ b/verror/common.vdl.go
@@ -8,7 +8,6 @@
package verror
import (
- // VDL system imports
"v.io/v23/context"
"v.io/v23/i18n"
)
diff --git a/vom/dump.vdl.go b/vom/dump.vdl.go
index 5848451..eaabdfe 100644
--- a/vom/dump.vdl.go
+++ b/vom/dump.vdl.go
@@ -8,7 +8,6 @@
package vom
import (
- // VDL system imports
"fmt"
"v.io/v23/vdl"
)
diff --git a/vom/internal/perf_test.vdl.go b/vom/internal/perf_test.vdl.go
index 0f5d6cb..2c4947e 100644
--- a/vom/internal/perf_test.vdl.go
+++ b/vom/internal/perf_test.vdl.go
@@ -8,7 +8,6 @@
package internal
import (
- // VDL system imports
"fmt"
"v.io/v23/vdl"
)
diff --git a/vom/testdata/data80/vomdata.vdl.go b/vom/testdata/data80/vomdata.vdl.go
index bcb36b6..d0196ac 100644
--- a/vom/testdata/data80/vomdata.vdl.go
+++ b/vom/testdata/data80/vomdata.vdl.go
@@ -8,10 +8,7 @@
package data80
import (
- // VDL system imports
"v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/vom/testdata/types"
)
diff --git a/vom/testdata/data81/vomdata.vdl.go b/vom/testdata/data81/vomdata.vdl.go
index ea76d5c..d570d8e 100644
--- a/vom/testdata/data81/vomdata.vdl.go
+++ b/vom/testdata/data81/vomdata.vdl.go
@@ -8,10 +8,7 @@
package data81
import (
- // VDL system imports
"v.io/v23/vdl"
-
- // VDL user imports
"v.io/v23/vom/testdata/types"
)
diff --git a/vom/testdata/types/testcase.vdl.go b/vom/testdata/types/testcase.vdl.go
index c03ff49..c50c4d3 100644
--- a/vom/testdata/types/testcase.vdl.go
+++ b/vom/testdata/types/testcase.vdl.go
@@ -8,7 +8,6 @@
package types
import (
- // VDL system imports
"v.io/v23/vdl"
)
diff --git a/vom/testdata/types/vomtype.vdl.go b/vom/testdata/types/vomtype.vdl.go
index 970a71a..05d76a6 100644
--- a/vom/testdata/types/vomtype.vdl.go
+++ b/vom/testdata/types/vomtype.vdl.go
@@ -8,7 +8,6 @@
package types
import (
- // VDL system imports
"fmt"
"v.io/v23/vdl"
)
diff --git a/vom/wiretype.vdl.go b/vom/wiretype.vdl.go
index 51064c0..0c8c973 100644
--- a/vom/wiretype.vdl.go
+++ b/vom/wiretype.vdl.go
@@ -8,7 +8,6 @@
package vom
import (
- // VDL system imports
"v.io/v23/vdl"
)
diff --git a/vtrace/types.vdl.go b/vtrace/types.vdl.go
index 9d7d165..eab64fc 100644
--- a/vtrace/types.vdl.go
+++ b/vtrace/types.vdl.go
@@ -8,12 +8,9 @@
package vtrace
import (
- // VDL system imports
- "v.io/v23/vdl"
-
- // VDL user imports
"time"
"v.io/v23/uniqueid"
+ "v.io/v23/vdl"
time_2 "v.io/v23/vdlroot/time"
)
