cf fix

fb_tonic_demo/Cargo.toml

@@ -16,6 +16,7 @@ tonic = { workspace = true }
 
 [build-dependencies]
 tonic-build = "0.11.0"
+flatc-rust = "*"
 
 [[bin]]
 name = "server"

fb_tonic_demo/build.rs

@@ -1,6 +1,22 @@
 use std::io::Result;
+use std::path::Path;
 
 fn main() -> Result<()> {
+    if let Ok(flatc_bin) = std::env::var("FLATC") {
+        std::env::set_var("PATH", std::env::var("PATH").unwrap() + format!(":{}", flatc_bin.as_str()).as_str());
+    }
+    else {
+        println!("FLATC enviroment variable not found!");
+    }
+
+    println!("cargo:rerun-if-changed=src/util/fbgreeting.fbs");
+    flatc_rust::run(flatc_rust::Args {
+        inputs: &[Path::new("src/util/fbgreeting.fbs")],
+        out_dir: Path::new("target/flatbuffers/"),
+        ..Default::default()
+    })
+    .expect("flatc");
+
     let greeter_service = tonic_build::manual::Service::builder()
         .name("Greeter")
         .package("fb.helloworld")

fb_tonic_demo/src/util/common.rs

@@ -14,34 +14,26 @@ use tonic::{
 // items been encoded or decoded shall not have any non static references.
 // However flatbuffer related types always have a 'fbb lifetime bound, I found no way to implement
 // something like serde do.
-pub struct FlatBufferBytes {
-    data: Vec<u8>,
-    head: usize,
-}
+pub struct FlatBufferBytes(Vec<u8>);
 
 impl FlatBufferBytes {
-    pub fn new(data: Vec<u8>, head: usize) -> Self {
-        Self { data, head }
-    }
-
-    pub fn valid_slice(&self) -> &[u8] {
-        &(self.data[self.head..])
+    pub fn new(data: Vec<u8>) -> Self {
+        Self(data)
     }
 
     pub fn serialize<'buf, T: flatbuffers::Follow<'buf> + 'buf>(
         mut builder: flatbuffers::FlatBufferBuilder<'buf>,
         root_offset: flatbuffers::WIPOffset<T>,
     ) -> Self {
         builder.finish(root_offset, None);
-        let (data, head) = builder.collapse();
-        Self { data, head }
+        let (mut data, head) = builder.collapse();
+        Self (data.drain(head..).collect())
     }
 
     pub fn deserialize<'buf, T: flatbuffers::Follow<'buf> + flatbuffers::Verifiable + 'buf>(
         &'buf self,
     ) -> Result<T::Inner, Box<dyn std::error::Error>> {
-        let data = self.valid_slice();
-        flatbuffers::root::<T>(data).map_err(|x| Box::new(x) as Box<dyn std::error::Error>)
+        flatbuffers::root::<T>(self.0.as_slice()).map_err(|x| Box::new(x) as Box<dyn std::error::Error>)
     }
 }
 
@@ -53,7 +45,7 @@ impl Encoder for FlatBufferEncoder {
     type Error = Status;
 
     fn encode(&mut self, item: Self::Item, buf: &mut EncodeBuf<'_>) -> Result<(), Self::Error> {
-        buf.put_slice(item.valid_slice());
+        buf.put_slice(item.0.as_slice());
         Ok(())
     }
 }
@@ -73,7 +65,7 @@ impl Decoder for FlatBufferDecoder {
         buf.reader()
             .read_to_end(&mut data)
             .map_err(|e| Status::internal(e.to_string()))?;
-        let item = FlatBufferBytes::new(data, 0);
+        let item = FlatBufferBytes::new(data);
         Ok(Some(item))
     }
 }

fb_tonic_demo/src/util/mod.rs

@@ -1,2 +1,4 @@
 pub mod common;
+#[allow(non_snake_case)]
+#[path = "../../target/flatbuffers/fbgreeting_generated.rs"]
 pub mod fbgreeting_generated;