aboutsummaryrefslogtreecommitdiff
path: root/generator
diff options
context:
space:
mode:
authorOskari Timperi <oskari.timperi@iki.fi>2018-04-03 18:48:59 +0300
committerOskari Timperi <oskari.timperi@iki.fi>2018-04-03 18:57:11 +0300
commite2cfc6717ae8acd9c47a132fa2cbc8446b5920c5 (patch)
tree98a6b22dab932f1f008b00b891b8b4a061a1bc9a /generator
parent3c9ba205af26ed8d48e68a30932d18d8b64382e0 (diff)
downloadnimpb-e2cfc6717ae8acd9c47a132fa2cbc8446b5920c5.tar.gz
nimpb-e2cfc6717ae8acd9c47a132fa2cbc8446b5920c5.zip
Rename stream.nim to protobuf.nim and merge with types.nim
Diffstat (limited to 'generator')
-rw-r--r--generator/descriptor_pb.nim3
-rw-r--r--generator/plugin_pb.nim3
-rw-r--r--generator/protoc_gen_nim.nim6
3 files changed, 4 insertions, 8 deletions
diff --git a/generator/descriptor_pb.nim b/generator/descriptor_pb.nim
index 890a61d..433a720 100644
--- a/generator/descriptor_pb.nim
+++ b/generator/descriptor_pb.nim
@@ -1,8 +1,7 @@
import intsets
-import protobuf/types
import protobuf/gen
-import protobuf/stream
+import protobuf/protobuf
const
FileDescriptorSetDesc = MessageDesc(
diff --git a/generator/plugin_pb.nim b/generator/plugin_pb.nim
index f8d9188..2f2eb1b 100644
--- a/generator/plugin_pb.nim
+++ b/generator/plugin_pb.nim
@@ -1,8 +1,7 @@
import intsets
-import protobuf/types
import protobuf/gen
-import protobuf/stream
+import protobuf/protobuf
import descriptor_pb
diff --git a/generator/protoc_gen_nim.nim b/generator/protoc_gen_nim.nim
index cec2761..1304ed9 100644
--- a/generator/protoc_gen_nim.nim
+++ b/generator/protoc_gen_nim.nim
@@ -10,8 +10,7 @@ import tables
import descriptor_pb
import plugin_pb
-import protobuf/stream
-import protobuf/types
+import protobuf/protobuf
import protobuf/gen
type
@@ -857,8 +856,7 @@ proc processFile(filename: string, fdesc: FileDescriptorProto,
addLine(result.data, "import tables")
addLine(result.data, "export tables")
addLine(result.data, "")
- addLine(result.data, "import protobuf/stream")
- addLine(result.data, "import protobuf/types")
+ addLine(result.data, "import protobuf/protobuf")
addLine(result.data, "")
for dep in fdesc.dependency: