Skip to content

Commit

Permalink
Fix std schema package names, remove json-test.capnp
Browse files Browse the repository at this point in the history
This commit fixes the package names generated by `gen.sh import`,
and removes `json-test.capnp` as it is unnecessary.
  • Loading branch information
Semisol committed Oct 16, 2024
1 parent 7493af7 commit a1ef2e9
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 1,799 deletions.
2 changes: 1 addition & 1 deletion std/capnp/compat/byte-stream.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ interface ByteStream {
}
using Go = import "/go.capnp";
$Go.package("bytestream");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/bytestream");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/compat/bytestream");
2 changes: 1 addition & 1 deletion std/capnp/compat/http-over-capnp.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,4 @@ struct HttpHeader {
}
using Go = import "/go.capnp";
$Go.package("httpovercapnp");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/httpovercapnp");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/compat/httpovercapnp");
2 changes: 1 addition & 1 deletion std/capnp/compat/httpovercapnp/http-over-capnp.capnp.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions std/capnp/compat/json-rpc.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ struct RpcMessage {

struct Error {
code @0 :Int32;
message @1 :Text;
message @1 :Text $Go.name("messageValue");
data @2 :Json.Value;
}
}
using Go = import "/go.capnp";
$Go.package("jsonrpc");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/jsonrpc");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/compat/jsonrpc");
126 changes: 0 additions & 126 deletions std/capnp/compat/json-test.capnp

This file was deleted.

4 changes: 2 additions & 2 deletions std/capnp/compat/json.capnp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Value {
null @0 :Void;
boolean @1 :Bool;
number @2 :Float64;
string @3 :Text;
string @3 :Text $Go.name("stringValue");
array @4 :List(Value);
object @5 :List(Field);
# Standard JSON values.
Expand Down Expand Up @@ -127,4 +127,4 @@ annotation notification @0xa0a054dea32fd98c (method) :Void;
# Indicates that this method is a JSON-RPC "notification", meaning it expects no response.
using Go = import "/go.capnp";
$Go.package("json");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/json");
$Go.import("capnproto.org/go/capnp/v3/std/capnp/compat/json");
152 changes: 77 additions & 75 deletions std/capnp/compat/json/json.capnp.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a1ef2e9

Please sign in to comment.