veyron2/vdl: Change vdl error syntax, and rename oneof to union.
The old vdl error syntax made errors look like return args:
type Arith interface {
Add(x, y int32) (int32, error)
}
While this is natural for Go, this is unnatural for languages
that use exceptions for error-handling, e.g. Java{,script}. In
the languages that use exceptions, an even more troubling issue
is that the exception and return args are exclusive; you can only
have one or the other. The Go-style errors allow both return
args and a non-nil error.
This is step 1 of the change to remedy the situation. In this
step we change the syntax of VDL errors. Here are some examples:
type Arith interface {
One(x int32) error
Two(x int32) (string | error)
Three(x int32) (a, b string | error)
}
The rule is that every method must have an "error clause". If
you have no return args, this looks just like it used to look.
If you have one or more return args, you use "|" to separate the
return args from the error clause. The error clause may not be
named; it's always just "error".
The compiled output and code-generation remains the same for now;
we'll fix those in more focused follow-on CLs.
Since we're already messing with VDL syntax, this CL also renames
"oneof" to "union" in the VDL type system. Only the Go code has
been updated; the Java and Javascript code will be updated
separately.
Change-Id: Ib373661ffd77585f9e9573a6cf484011d3a42935
MultiPart: 1/8
diff --git a/runtimes/google/ipc/benchmarks/service.vdl b/runtimes/google/ipc/benchmarks/service.vdl
index 5d6872c..c50df79 100644
--- a/runtimes/google/ipc/benchmarks/service.vdl
+++ b/runtimes/google/ipc/benchmarks/service.vdl
@@ -8,7 +8,7 @@
type Benchmark interface {
// Echo returns the payload that it receives.
- Echo(Payload []byte) ([]byte, error) {access.Read}
+ Echo(Payload []byte) ([]byte | error) {access.Read}
// EchoStream returns the payload that it receives via the stream.
EchoStream() stream<[]byte,[]byte> error {access.Read}
}
diff --git a/security/agent/pingpong/wire.vdl b/security/agent/pingpong/wire.vdl
index 0fc2ed4..79a9a81 100644
--- a/security/agent/pingpong/wire.vdl
+++ b/security/agent/pingpong/wire.vdl
@@ -2,5 +2,5 @@
// Simple service used in the agent tests.
type PingPong interface {
- Ping(message string) (string, error)
+ Ping(message string) (string | error)
}
diff --git a/security/agent/server/wire.vdl b/security/agent/server/wire.vdl
index ee55e0b..8e4733a 100644
--- a/security/agent/server/wire.vdl
+++ b/security/agent/server/wire.vdl
@@ -30,23 +30,23 @@
)
type Agent interface {
- Bless(key []byte, wit security.WireBlessings, extension string, caveat security.Caveat, additionalCaveats []security.Caveat) (security.WireBlessings, error)
- BlessSelf(name string, caveats []security.Caveat) (security.WireBlessings, error)
- Sign(message []byte) (security.Signature, error)
- MintDischarge(tp any, caveat security.Caveat, additionalCaveats []security.Caveat) (any, error)
- PublicKey() ([]byte, error)
- BlessingsByName(name security.BlessingPattern) ([]security.WireBlessings, error)
- BlessingsInfo(blessings security.WireBlessings) ([]string, error)
+ Bless(key []byte, wit security.WireBlessings, extension string, caveat security.Caveat, additionalCaveats []security.Caveat) (security.WireBlessings | error)
+ BlessSelf(name string, caveats []security.Caveat) (security.WireBlessings | error)
+ Sign(message []byte) (security.Signature | error)
+ MintDischarge(tp any, caveat security.Caveat, additionalCaveats []security.Caveat) (any | error)
+ PublicKey() ([]byte | error)
+ BlessingsByName(name security.BlessingPattern) ([]security.WireBlessings | error)
+ BlessingsInfo(blessings security.WireBlessings) ([]string | error)
AddToRoots(blessing security.WireBlessings) error
- BlessingStoreSet(blessings security.WireBlessings, forPeers security.BlessingPattern) (security.WireBlessings, error)
- BlessingStoreForPeer(peerBlessings []string) (security.WireBlessings, error)
+ BlessingStoreSet(blessings security.WireBlessings, forPeers security.BlessingPattern) (security.WireBlessings | error)
+ BlessingStoreForPeer(peerBlessings []string) (security.WireBlessings | error)
BlessingStoreSetDefault(blessings security.WireBlessings) error
- BlessingStoreDefault() (security.WireBlessings, error)
- BlessingStorePeerBlessings() (map[security.BlessingPattern]security.WireBlessings, error)
- BlessingStoreDebugString() (string, error)
+ BlessingStoreDefault() (security.WireBlessings | error)
+ BlessingStorePeerBlessings() (map[security.BlessingPattern]security.WireBlessings | error)
+ BlessingStoreDebugString() (string | error)
BlessingRootsAdd(root []byte, pattern security.BlessingPattern) error
BlessingRootsRecognized(root []byte, blessing string) error
- BlessingRootsDebugString() (string, error)
+ BlessingRootsDebugString() (string | error)
}
diff --git a/services/identity/identity.vdl b/services/identity/identity.vdl
index ada48b2..0d35fdf 100644
--- a/services/identity/identity.vdl
+++ b/services/identity/identity.vdl
@@ -19,12 +19,12 @@
type OAuthBlesser interface {
// BlessUsingAccessToken uses the provided access token to obtain the email
// address and returns a blessing along with the email address.
- BlessUsingAccessToken(token string) (blessing security.WireBlessings, email string, err error)
+ BlessUsingAccessToken(token string) (blessing security.WireBlessings, email string | error)
}
// MacaroonBlesser returns a blessing given the provided macaroon string.
type MacaroonBlesser interface {
// Bless uses the provided macaroon (which contains email and caveats)
// to return a blessing for the client.
- Bless(macaroon string) (blessing security.WireBlessings, err error)
+ Bless(macaroon string) (blessing security.WireBlessings | error)
}
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index ab9acb4..2b17c35 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -34,7 +34,7 @@
public.Profile
// Specification returns the profile specification for the profile
// identified through the object name suffix.
- Specification() (profile.Specification, error) {access.Read}
+ Specification() (profile.Specification | error) {access.Read}
// Put sets the profile specification for the profile identified
// through the object name suffix.
Put(Specification profile.Specification) error {access.Write}
diff --git a/services/mounttable/lib/collection_test_interface.vdl b/services/mounttable/lib/collection_test_interface.vdl
index 0396a5d..aba1d2d 100644
--- a/services/mounttable/lib/collection_test_interface.vdl
+++ b/services/mounttable/lib/collection_test_interface.vdl
@@ -9,5 +9,5 @@
// Lookup retrieves the value associated with a name. Returns an error if
// there is no such binding.
- Lookup() ([]byte, error)
+ Lookup() ([]byte | error)
}
diff --git a/services/security/discharger.vdl b/services/security/discharger.vdl
index a7dfbd3..422cab7 100644
--- a/services/security/discharger.vdl
+++ b/services/security/discharger.vdl
@@ -12,5 +12,5 @@
// respectively. (not enforced here because vdl does not know these types)
// TODO(ataly,ashankar): Figure out a VDL representation for ThirdPartyCaveat
// and Discharge and use those here?
- Discharge(Caveat any, Impetus security.DischargeImpetus) (Discharge any, err error)
+ Discharge(Caveat any, Impetus security.DischargeImpetus) (Discharge any | error)
}
diff --git a/tools/vrpc/impl_test.go b/tools/vrpc/impl_test.go
index 1bf91de..6e3561c 100644
--- a/tools/vrpc/impl_test.go
+++ b/tools/vrpc/impl_test.go
@@ -197,26 +197,27 @@
return
}
+ // TODO(toddw): Switch VRPC to new __Signature, and update these tests.
expectedSignature := []string{
- "func EchoBool(I1 bool) (O1 bool, E error)",
- "func EchoFloat32(I1 float32) (O1 float32, E error)",
- "func EchoFloat64(I1 float64) (O1 float64, E error)",
- "func EchoInt32(I1 int32) (O1 int32, E error)",
- "func EchoInt64(I1 int64) (O1 int64, E error)",
- "func EchoString(I1 string) (O1 string, E error)",
- "func EchoByte(I1 byte) (O1 byte, E error)",
- "func EchoUInt32(I1 uint32) (O1 uint32, E error)",
- "func EchoUInt64(I1 uint64) (O1 uint64, E error)",
- "func InputArray(I1 [2]byte) (E error)",
- "func InputMap(I1 map[byte]byte) (E error)",
- "func InputSlice(I1 []byte) (E error)",
- "func InputStruct(I1 struct{X int32, Y int32}) (E error)",
- "func OutputArray() (O1 [2]byte, E error)",
- "func OutputMap() (O1 map[byte]byte, E error)",
- "func OutputSlice() (O1 []byte, E error)",
- "func OutputStruct() (O1 struct{X int32, Y int32}, E error)",
+ "func EchoBool(I1 bool) (O1 bool, err error)",
+ "func EchoFloat32(I1 float32) (O1 float32, err error)",
+ "func EchoFloat64(I1 float64) (O1 float64, err error)",
+ "func EchoInt32(I1 int32) (O1 int32, err error)",
+ "func EchoInt64(I1 int64) (O1 int64, err error)",
+ "func EchoString(I1 string) (O1 string, err error)",
+ "func EchoByte(I1 byte) (O1 byte, err error)",
+ "func EchoUInt32(I1 uint32) (O1 uint32, err error)",
+ "func EchoUInt64(I1 uint64) (O1 uint64, err error)",
+ "func InputArray(I1 [2]byte) (error)",
+ "func InputMap(I1 map[byte]byte) (error)",
+ "func InputSlice(I1 []byte) (error)",
+ "func InputStruct(I1 struct{X int32, Y int32}) (error)",
+ "func OutputArray() (O1 [2]byte, err error)",
+ "func OutputMap() (O1 map[byte]byte, err error)",
+ "func OutputSlice() (O1 []byte, err error)",
+ "func OutputStruct() (O1 struct{X int32, Y int32}, err error)",
"func NoArguments() (error)",
- "func MultipleArguments(I1 int32, I2 int32) (O1 int32, O2 int32, E error)",
+ "func MultipleArguments(I1 int32, I2 int32) (O1 int32, O2 int32, err error)",
"func StreamingOutput(NumStreamItems int32, StreamItem bool) stream<_, bool> (error)",
}
diff --git a/tools/vrpc/test_base/test_base.vdl b/tools/vrpc/test_base/test_base.vdl
index ba6496c..8f6b15e 100644
--- a/tools/vrpc/test_base/test_base.vdl
+++ b/tools/vrpc/test_base/test_base.vdl
@@ -6,29 +6,29 @@
type TypeTester interface {
// Methods to test support for generic types.
- EchoBool(I1 bool) (O1 bool, E error)
- EchoFloat32(I1 float32) (O1 float32, E error)
- EchoFloat64(I1 float64) (O1 float64, E error)
- EchoInt32(I1 int32) (O1 int32, E error)
- EchoInt64(I1 int64) (O1 int64, E error)
- EchoString(I1 string) (O1 string, E error)
- EchoByte(I1 byte) (O1 byte, E error)
- EchoUInt32(I1 uint32) (O1 uint32, E error)
- EchoUInt64(I1 uint64) (O1 uint64, E error)
+ EchoBool(I1 bool) (O1 bool | error)
+ EchoFloat32(I1 float32) (O1 float32 | error)
+ EchoFloat64(I1 float64) (O1 float64 | error)
+ EchoInt32(I1 int32) (O1 int32 | error)
+ EchoInt64(I1 int64) (O1 int64 | error)
+ EchoString(I1 string) (O1 string | error)
+ EchoByte(I1 byte) (O1 byte | error)
+ EchoUInt32(I1 uint32) (O1 uint32 | error)
+ EchoUInt64(I1 uint64) (O1 uint64 | error)
// Methods to test support for composite types.
- InputArray(I1 [2]byte) (E error)
- InputMap(I1 map[byte]byte) (E error)
- InputSlice(I1 []byte) (E error)
- InputStruct(I1 Struct) (E error)
- OutputArray() (O1 [2]byte, E error)
- OutputMap() (O1 map[byte]byte, E error)
- OutputSlice() (O1 []byte, E error)
- OutputStruct() (O1 Struct, E error)
+ InputArray(I1 [2]byte) error
+ InputMap(I1 map[byte]byte) error
+ InputSlice(I1 []byte) error
+ InputStruct(I1 Struct) error
+ OutputArray() (O1 [2]byte | error)
+ OutputMap() (O1 map[byte]byte | error)
+ OutputSlice() (O1 []byte | error)
+ OutputStruct() (O1 Struct | error)
// Methods to test support for different number of arguments.
NoArguments() error
- MultipleArguments(I1, I2 int32) (O1, O2 int32, E error)
+ MultipleArguments(I1, I2 int32) (O1, O2 int32 | error)
// Methods to test support for streaming.
StreamingOutput(NumStreamItems int32, StreamItem bool) stream<_, bool> error
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index 3a8e3ab..1932cfb 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -398,27 +398,27 @@
// implements for TypeTester.
type TypeTesterServerMethods interface {
// Methods to test support for generic types.
- EchoBool(ctx __ipc.ServerContext, I1 bool) (O1 bool, E error)
- EchoFloat32(ctx __ipc.ServerContext, I1 float32) (O1 float32, E error)
- EchoFloat64(ctx __ipc.ServerContext, I1 float64) (O1 float64, E error)
- EchoInt32(ctx __ipc.ServerContext, I1 int32) (O1 int32, E error)
- EchoInt64(ctx __ipc.ServerContext, I1 int64) (O1 int64, E error)
- EchoString(ctx __ipc.ServerContext, I1 string) (O1 string, E error)
- EchoByte(ctx __ipc.ServerContext, I1 byte) (O1 byte, E error)
- EchoUInt32(ctx __ipc.ServerContext, I1 uint32) (O1 uint32, E error)
- EchoUInt64(ctx __ipc.ServerContext, I1 uint64) (O1 uint64, E error)
+ EchoBool(ctx __ipc.ServerContext, I1 bool) (O1 bool, err error)
+ EchoFloat32(ctx __ipc.ServerContext, I1 float32) (O1 float32, err error)
+ EchoFloat64(ctx __ipc.ServerContext, I1 float64) (O1 float64, err error)
+ EchoInt32(ctx __ipc.ServerContext, I1 int32) (O1 int32, err error)
+ EchoInt64(ctx __ipc.ServerContext, I1 int64) (O1 int64, err error)
+ EchoString(ctx __ipc.ServerContext, I1 string) (O1 string, err error)
+ EchoByte(ctx __ipc.ServerContext, I1 byte) (O1 byte, err error)
+ EchoUInt32(ctx __ipc.ServerContext, I1 uint32) (O1 uint32, err error)
+ EchoUInt64(ctx __ipc.ServerContext, I1 uint64) (O1 uint64, err error)
// Methods to test support for composite types.
- InputArray(ctx __ipc.ServerContext, I1 [2]byte) (E error)
- InputMap(ctx __ipc.ServerContext, I1 map[byte]byte) (E error)
- InputSlice(ctx __ipc.ServerContext, I1 []byte) (E error)
- InputStruct(ctx __ipc.ServerContext, I1 Struct) (E error)
- OutputArray(__ipc.ServerContext) (O1 [2]byte, E error)
- OutputMap(__ipc.ServerContext) (O1 map[byte]byte, E error)
- OutputSlice(__ipc.ServerContext) (O1 []byte, E error)
- OutputStruct(__ipc.ServerContext) (O1 Struct, E error)
+ InputArray(ctx __ipc.ServerContext, I1 [2]byte) error
+ InputMap(ctx __ipc.ServerContext, I1 map[byte]byte) error
+ InputSlice(ctx __ipc.ServerContext, I1 []byte) error
+ InputStruct(ctx __ipc.ServerContext, I1 Struct) error
+ OutputArray(__ipc.ServerContext) (O1 [2]byte, err error)
+ OutputMap(__ipc.ServerContext) (O1 map[byte]byte, err error)
+ OutputSlice(__ipc.ServerContext) (O1 []byte, err error)
+ OutputStruct(__ipc.ServerContext) (O1 Struct, err error)
// Methods to test support for different number of arguments.
NoArguments(__ipc.ServerContext) error
- MultipleArguments(ctx __ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, E error)
+ MultipleArguments(ctx __ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, err error)
// Methods to test support for streaming.
StreamingOutput(ctx TypeTesterStreamingOutputContext, NumStreamItems int32, StreamItem bool) error
}
@@ -429,27 +429,27 @@
// is the streaming methods.
type TypeTesterServerStubMethods interface {
// Methods to test support for generic types.
- EchoBool(ctx __ipc.ServerContext, I1 bool) (O1 bool, E error)
- EchoFloat32(ctx __ipc.ServerContext, I1 float32) (O1 float32, E error)
- EchoFloat64(ctx __ipc.ServerContext, I1 float64) (O1 float64, E error)
- EchoInt32(ctx __ipc.ServerContext, I1 int32) (O1 int32, E error)
- EchoInt64(ctx __ipc.ServerContext, I1 int64) (O1 int64, E error)
- EchoString(ctx __ipc.ServerContext, I1 string) (O1 string, E error)
- EchoByte(ctx __ipc.ServerContext, I1 byte) (O1 byte, E error)
- EchoUInt32(ctx __ipc.ServerContext, I1 uint32) (O1 uint32, E error)
- EchoUInt64(ctx __ipc.ServerContext, I1 uint64) (O1 uint64, E error)
+ EchoBool(ctx __ipc.ServerContext, I1 bool) (O1 bool, err error)
+ EchoFloat32(ctx __ipc.ServerContext, I1 float32) (O1 float32, err error)
+ EchoFloat64(ctx __ipc.ServerContext, I1 float64) (O1 float64, err error)
+ EchoInt32(ctx __ipc.ServerContext, I1 int32) (O1 int32, err error)
+ EchoInt64(ctx __ipc.ServerContext, I1 int64) (O1 int64, err error)
+ EchoString(ctx __ipc.ServerContext, I1 string) (O1 string, err error)
+ EchoByte(ctx __ipc.ServerContext, I1 byte) (O1 byte, err error)
+ EchoUInt32(ctx __ipc.ServerContext, I1 uint32) (O1 uint32, err error)
+ EchoUInt64(ctx __ipc.ServerContext, I1 uint64) (O1 uint64, err error)
// Methods to test support for composite types.
- InputArray(ctx __ipc.ServerContext, I1 [2]byte) (E error)
- InputMap(ctx __ipc.ServerContext, I1 map[byte]byte) (E error)
- InputSlice(ctx __ipc.ServerContext, I1 []byte) (E error)
- InputStruct(ctx __ipc.ServerContext, I1 Struct) (E error)
- OutputArray(__ipc.ServerContext) (O1 [2]byte, E error)
- OutputMap(__ipc.ServerContext) (O1 map[byte]byte, E error)
- OutputSlice(__ipc.ServerContext) (O1 []byte, E error)
- OutputStruct(__ipc.ServerContext) (O1 Struct, E error)
+ InputArray(ctx __ipc.ServerContext, I1 [2]byte) error
+ InputMap(ctx __ipc.ServerContext, I1 map[byte]byte) error
+ InputSlice(ctx __ipc.ServerContext, I1 []byte) error
+ InputStruct(ctx __ipc.ServerContext, I1 Struct) error
+ OutputArray(__ipc.ServerContext) (O1 [2]byte, err error)
+ OutputMap(__ipc.ServerContext) (O1 map[byte]byte, err error)
+ OutputSlice(__ipc.ServerContext) (O1 []byte, err error)
+ OutputStruct(__ipc.ServerContext) (O1 Struct, err error)
// Methods to test support for different number of arguments.
NoArguments(__ipc.ServerContext) error
- MultipleArguments(ctx __ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, E error)
+ MultipleArguments(ctx __ipc.ServerContext, I1 int32, I2 int32) (O1 int32, O2 int32, err error)
// Methods to test support for streaming.
StreamingOutput(ctx *TypeTesterStreamingOutputContextStub, NumStreamItems int32, StreamItem bool) error
}
@@ -588,8 +588,8 @@
{"I1", ``}, // bool
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // bool
- {"E", ``}, // error
+ {"O1", ``}, // bool
+ {"err", ``}, // error
},
},
{
@@ -598,8 +598,8 @@
{"I1", ``}, // float32
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // float32
- {"E", ``}, // error
+ {"O1", ``}, // float32
+ {"err", ``}, // error
},
},
{
@@ -608,8 +608,8 @@
{"I1", ``}, // float64
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // float64
- {"E", ``}, // error
+ {"O1", ``}, // float64
+ {"err", ``}, // error
},
},
{
@@ -618,8 +618,8 @@
{"I1", ``}, // int32
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // int32
- {"E", ``}, // error
+ {"O1", ``}, // int32
+ {"err", ``}, // error
},
},
{
@@ -628,8 +628,8 @@
{"I1", ``}, // int64
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // int64
- {"E", ``}, // error
+ {"O1", ``}, // int64
+ {"err", ``}, // error
},
},
{
@@ -638,8 +638,8 @@
{"I1", ``}, // string
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // string
- {"E", ``}, // error
+ {"O1", ``}, // string
+ {"err", ``}, // error
},
},
{
@@ -648,8 +648,8 @@
{"I1", ``}, // byte
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // byte
- {"E", ``}, // error
+ {"O1", ``}, // byte
+ {"err", ``}, // error
},
},
{
@@ -658,8 +658,8 @@
{"I1", ``}, // uint32
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // uint32
- {"E", ``}, // error
+ {"O1", ``}, // uint32
+ {"err", ``}, // error
},
},
{
@@ -668,8 +668,8 @@
{"I1", ``}, // uint64
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // uint64
- {"E", ``}, // error
+ {"O1", ``}, // uint64
+ {"err", ``}, // error
},
},
{
@@ -679,7 +679,7 @@
{"I1", ``}, // [2]byte
},
OutArgs: []__ipc.ArgDesc{
- {"E", ``}, // error
+ {"", ``}, // error
},
},
{
@@ -688,7 +688,7 @@
{"I1", ``}, // map[byte]byte
},
OutArgs: []__ipc.ArgDesc{
- {"E", ``}, // error
+ {"", ``}, // error
},
},
{
@@ -697,7 +697,7 @@
{"I1", ``}, // []byte
},
OutArgs: []__ipc.ArgDesc{
- {"E", ``}, // error
+ {"", ``}, // error
},
},
{
@@ -706,35 +706,35 @@
{"I1", ``}, // Struct
},
OutArgs: []__ipc.ArgDesc{
- {"E", ``}, // error
+ {"", ``}, // error
},
},
{
Name: "OutputArray",
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // [2]byte
- {"E", ``}, // error
+ {"O1", ``}, // [2]byte
+ {"err", ``}, // error
},
},
{
Name: "OutputMap",
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // map[byte]byte
- {"E", ``}, // error
+ {"O1", ``}, // map[byte]byte
+ {"err", ``}, // error
},
},
{
Name: "OutputSlice",
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // []byte
- {"E", ``}, // error
+ {"O1", ``}, // []byte
+ {"err", ``}, // error
},
},
{
Name: "OutputStruct",
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // Struct
- {"E", ``}, // error
+ {"O1", ``}, // Struct
+ {"err", ``}, // error
},
},
{
@@ -751,9 +751,9 @@
{"I2", ``}, // int32
},
OutArgs: []__ipc.ArgDesc{
- {"O1", ``}, // int32
- {"O2", ``}, // int32
- {"E", ``}, // error
+ {"O1", ``}, // int32
+ {"O2", ``}, // int32
+ {"err", ``}, // error
},
},
{
@@ -779,7 +779,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 2},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoByte"] = __ipc.MethodSignature{
@@ -788,7 +788,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 66},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoFloat32"] = __ipc.MethodSignature{
@@ -797,7 +797,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 25},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoFloat64"] = __ipc.MethodSignature{
@@ -806,7 +806,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 26},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoInt32"] = __ipc.MethodSignature{
@@ -815,7 +815,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 36},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoInt64"] = __ipc.MethodSignature{
@@ -824,7 +824,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 37},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoString"] = __ipc.MethodSignature{
@@ -833,7 +833,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 3},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoUInt32"] = __ipc.MethodSignature{
@@ -842,7 +842,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 52},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["EchoUInt64"] = __ipc.MethodSignature{
@@ -851,7 +851,7 @@
},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 53},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["InputArray"] = __ipc.MethodSignature{
@@ -859,7 +859,7 @@
{Name: "I1", Type: 67},
},
OutArgs: []__ipc.MethodArgument{
- {Name: "E", Type: 65},
+ {Name: "", Type: 65},
},
}
result.Methods["InputMap"] = __ipc.MethodSignature{
@@ -867,7 +867,7 @@
{Name: "I1", Type: 68},
},
OutArgs: []__ipc.MethodArgument{
- {Name: "E", Type: 65},
+ {Name: "", Type: 65},
},
}
result.Methods["InputSlice"] = __ipc.MethodSignature{
@@ -875,7 +875,7 @@
{Name: "I1", Type: 69},
},
OutArgs: []__ipc.MethodArgument{
- {Name: "E", Type: 65},
+ {Name: "", Type: 65},
},
}
result.Methods["InputStruct"] = __ipc.MethodSignature{
@@ -883,7 +883,7 @@
{Name: "I1", Type: 70},
},
OutArgs: []__ipc.MethodArgument{
- {Name: "E", Type: 65},
+ {Name: "", Type: 65},
},
}
result.Methods["MultipleArguments"] = __ipc.MethodSignature{
@@ -894,7 +894,7 @@
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 36},
{Name: "O2", Type: 36},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["NoArguments"] = __ipc.MethodSignature{
@@ -907,28 +907,28 @@
InArgs: []__ipc.MethodArgument{},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 67},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["OutputMap"] = __ipc.MethodSignature{
InArgs: []__ipc.MethodArgument{},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 68},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["OutputSlice"] = __ipc.MethodSignature{
InArgs: []__ipc.MethodArgument{},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 69},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["OutputStruct"] = __ipc.MethodSignature{
InArgs: []__ipc.MethodArgument{},
OutArgs: []__ipc.MethodArgument{
{Name: "O1", Type: 70},
- {Name: "E", Type: 65},
+ {Name: "err", Type: 65},
},
}
result.Methods["StreamingOutput"] = __ipc.MethodSignature{
