Fix grpc encoding

semtexzv · Oct 4, 2023 · 8f61220 · 8f61220
1 parent 88cb277
commit 8f61220
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 72 deletions.
diff --git a/protokit/Cargo.toml b/protokit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -16,30 +16,30 @@ descriptors = ["desc/descriptors"]
 [dependencies.binformat]
 package = "protokit_binformat"
 path = "../protokit_binformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.textformat]
 package = "protokit_textformat"
 path = "../protokit_textformat"
-version = "0.1.2"
+version = "0.1.3"
 optional = true
 
 [dependencies.desc]
 package = "protokit_desc"
 path = "../protokit_desc"
-version = "0.1.2"
+version = "0.1.3"
 optional = true
 
 [dependencies.grpc]
 package = "protokit_grpc"
 path = "../protokit_grpc"
-version = "0.1.2"
+version = "0.1.3"
 optional = true
 
 [dependencies.derive]
 package = "protokit_derive"
 path = "../protokit_derive"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
 anyhow = "1"

diff --git a/protokit/src/lib.rs b/protokit/src/lib.rs
@@ -1,11 +1,8 @@
 pub use anyhow::Result;
-pub use derive::{protoenum, Proto};
-
 pub use binformat::{self, BinProto, BytesLike, Fixed, Sigint, Varint};
-
-#[cfg(feature = "textformat")]
-pub use textformat::{self, TextField as _, TextProto};
-
+pub use derive::{protoenum, Proto};
 #[cfg(feature = "grpc")]
 pub use grpc;
 pub use indexmap::IndexMap;
+#[cfg(feature = "textformat")]
+pub use textformat::{self, TextField as _, TextProto};
diff --git a/protokit_binformat/Cargo.toml b/protokit_binformat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_binformat"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -15,7 +15,7 @@ arena = ["bumpalo", "bumpalo/boxed", "bumpalo/collections"]
 [dependencies.derive]
 package = "protokit_derive"
 path = "../protokit_derive"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
 bytes = "1.4.0"

diff --git a/protokit_build/Cargo.toml b/protokit_build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_build"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -17,15 +17,15 @@ descriptors = ["protokit_desc/descriptors"]
 
 [dependencies.protokit_binformat]
 path = "../protokit_binformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.protokit_desc]
 path = "../protokit_desc"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.protokit_proto]
 path = "../protokit_proto"
-version = "0.1.2"
+version = "0.1.3"
 default-features = false
 optional = true
 

diff --git a/protokit_derive/Cargo.toml b/protokit_derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_derive"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2018"
 license = "MIT"
 readme = "../README.MD"

diff --git a/protokit_desc/Cargo.toml b/protokit_desc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_desc"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -15,17 +15,17 @@ descriptors = []
 [dependencies.binformat]
 package = "protokit_binformat"
 path = "../protokit_binformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.textformat]
 package = "protokit_textformat"
 path = "../protokit_textformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.derive]
 package = "protokit_derive"
 path = "../protokit_derive"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
 arcstr = "1.1.4"

diff --git a/protokit_desc/src/lib.rs b/protokit_desc/src/lib.rs
@@ -352,7 +352,7 @@ impl FieldDef {
             FieldDescriptorProtoType::TYPE_GROUP => {
                 let mut n = desc.type_name.as_deref().unwrap();
                 while let Some(p) = n.find('.') {
-                    n = &n[p + 1..]
+                    n = &n[p + 1 ..]
                 }
                 name = set.cache(n);
                 DataType::Unresolved(set.cache(desc.type_name.as_ref().unwrap()), UnresolvedHint::Group)
@@ -410,7 +410,7 @@ impl FieldDef {
             DataType::Map(map) => {
                 let mut name = self.name.clone().to_string();
                 unsafe {
-                    name.as_bytes_mut()[..1].make_ascii_uppercase();
+                    name.as_bytes_mut()[.. 1].make_ascii_uppercase();
                 }
                 let map_entry_name = format!("{name}Entry");
                 fout.type_name = Some(format!(
@@ -676,10 +676,14 @@ impl ServiceDef {
     ) -> Self {
         Self {
             name: name.clone(),
-            rpc: desc.method.iter().map(|v| {
-                let name = set.cache(v.name.as_ref().expect("Missing service name"));
-                (name.clone(), RpcDef::from_descriptor(set, &name, &v))
-            }).collect(),
+            rpc: desc
+                .method
+                .iter()
+                .map(|v| {
+                    let name = set.cache(v.name.as_ref().expect("Missing service name"));
+                    (name.clone(), RpcDef::from_descriptor(set, &name, &v))
+                })
+                .collect(),
             options: desc.options.as_deref().cloned().unwrap_or_default(),
         }
     }
@@ -726,11 +730,7 @@ impl RpcDef {
         out
     }
     #[cfg(feature = "descriptors")]
-    fn from_descriptor(
-        set: &mut FileSetDef,
-        name: &ArcStr,
-        desc: &MethodDescriptorProto,
-    ) -> Self {
+    fn from_descriptor(set: &mut FileSetDef, name: &ArcStr, desc: &MethodDescriptorProto) -> Self {
         Self {
             name: name.clone(),
             req_stream: desc.client_streaming.unwrap_or_default(),
@@ -1214,7 +1214,7 @@ fn try_resolve_within_scopes(
         let qualified = format!("{scope}{scope_dot}{symbol}");
         match (names.get(qualified.as_str()), scope.rfind('.')) {
             (Some(v), _) => return Some(*v),
-            (None, Some(p)) => scope = &scope[..p],
+            (None, Some(p)) => scope = &scope[.. p],
             // Resolve globally without the prefix
             (None, None) => return names.get(symbol).copied(),
         }
@@ -1230,14 +1230,14 @@ fn try_resolve_symbol(
     if let Some(without_dot) = symbol.strip_prefix('.') {
         // We're searching for global symbol. If package prefix matches, we can search for the inner part of the symbol
         if let Some(without_package) = without_dot.strip_prefix(file_package) {
-            let localized_symbol = &without_package[1..];
+            let localized_symbol = &without_package[1 ..];
             return names.get(localized_symbol).cloned();
         } else {
             eprintln!("Package mismatch: {} within: {}", without_dot, &file_package);
             return None;
         }
     } else if let Some(localized) = symbol.strip_prefix(file_package) {
-        let localized_symbol = &localized[1..];
+        let localized_symbol = &localized[1 ..];
         return names.get(localized_symbol).cloned();
     }
 
@@ -1255,7 +1255,7 @@ fn try_resolve_symbol(
         ) {
             (Some(v), _) => return Some(v),
             // We need to remove subpackages, because name sections might be of nested messages, not package names
-            (None, Some(v)) => file_package = &file_package[..v],
+            (None, Some(v)) => file_package = &file_package[.. v],
             (None, None) => {
                 return try_resolve_within_scopes(names, "", symbol);
             }

diff --git a/protokit_examples/Cargo.toml b/protokit_examples/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_examples"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -13,7 +13,7 @@ publish = false
 
 
 [dependencies]
-protokit = { path = "../protokit", version = "0.1.2", features = ["textformat", "grpc"] }
+protokit = { path = "../protokit", version = "0.1.3", features = ["textformat", "grpc"] }
 
 [build-dependencies]
 protokit_build = { path = "../protokit_build" }
diff --git a/protokit_examples/src/main.rs b/protokit_examples/src/main.rs
@@ -1,7 +1,7 @@
 use std::io::{stdin, BufRead};
-use protokit::Proto;
 
 use protokit::textformat::reflect::Registry;
+use protokit::Proto;
 
 pub mod gen {
     include!(concat!(env!("OUT_DIR"), "/mod.rs"));

diff --git a/protokit_grpc/Cargo.toml b/protokit_grpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_grpc"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -12,7 +12,7 @@ description = "Usable protocol buffers"
 [dependencies.binformat]
 package = "protokit_binformat"
 path = "../protokit_binformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.tonic]
 version = "0.9.1"

diff --git a/protokit_grpc/src/lib.rs b/protokit_grpc/src/lib.rs
@@ -1,7 +1,7 @@
 use core::marker::PhantomData;
 
 pub use async_trait::async_trait;
-use binformat::{Error, OutputStream};
+use binformat::{Error, OutputStream, SizeStack};
 use bytes::Buf;
 pub use futures::future::LocalBoxFuture;
 pub use futures::stream::Stream;
@@ -52,11 +52,7 @@ impl<'buf, T: binformat::BinProto<'buf>> Encoder for TonicEncoder<T> {
 
     fn encode(&mut self, item: Self::Item, buf: &mut EncodeBuf<'_>) -> Result<(), Self::Error> {
         use bytes::BufMut;
-
-        let mut tmp = OutputStream::default();
-        item.encode(&mut tmp); //.expect("Message only errors if not enough space");
-        buf.put_slice(&tmp.finish());
-
+        buf.put_slice(&binformat::encode(&item).unwrap());
         Ok(())
     }
 }

diff --git a/protokit_proto/Cargo.toml b/protokit_proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_proto"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -14,11 +14,11 @@ descriptors = ["protokit_desc/descriptors"]
 
 [dependencies.protokit_textformat]
 path = "../protokit_textformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.protokit_desc]
 path = "../protokit_desc"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
 nom = "7.1.1"

diff --git a/protokit_textformat/Cargo.toml b/protokit_textformat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "protokit_textformat"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 readme = "../README.MD"
@@ -14,7 +14,7 @@ default = []
 [dependencies.binformat]
 package = "protokit_binformat"
 path = "../protokit_binformat"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies]
 logos = { version = "0.13.0", default-features = false, features = ["export_derive"] }

diff --git a/protokit_textformat/src/lex.rs b/protokit_textformat/src/lex.rs
@@ -67,6 +67,7 @@ pub enum Token {
 #[cfg(test)]
 mod test {
     use logos::Lexer;
+
     use crate::lex::Token;
 
     #[test]