update to cookie-factory 0.3

sozu-proxy · Jul 13, 2022 · 3822c5a · 3822c5a
1 parent 6da9038
commit 3822c5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -45,7 +45,7 @@ poule = "0.3.2"
 lazycell = "1.2"
 hashbrown = "0.1"
 regex = "1.1"
-cookie-factory = "^0.2"
+cookie-factory = "^0.3"
 hpack = "^0.3"
 
 [dev-dependencies]

diff --git a/lib/src/protocol/h2/serializer.rs b/lib/src/protocol/h2/serializer.rs
@@ -1,16 +1,15 @@
-use cookie_factory::GenError;
+use cookie_factory::{GenError, gen, bytes::{be_u8, be_u24, be_u32}, sequence::tuple};
 use super::parser::{FrameHeader,FrameType};
 
 pub fn gen_frame_header<'a, 'b>(x: (&'a mut [u8], usize), frame: &'b FrameHeader) -> Result<(&'a mut [u8], usize), GenError> {
-  /*
-  do_gen!(x,
-    gen_be_u24!(frame.payload_len) >>
-    gen_be_u8!(serialize_frame_type(&frame.frame_type)) >>
-    gen_be_u8!(frame.flags) >>
-    gen_be_u32!(frame.stream_id)
-  )
-    */
-  unimplemented!()
+  let serializer = tuple((
+    be_u24(frame.payload_len),
+    be_u8(serialize_frame_type(&frame.frame_type)),
+    be_u8(frame.flags),
+    be_u32(frame.stream_id)
+  ));
+
+  gen(serializer, x.0).map(|(buf, sz)| (buf, sz as usize))
 }
 
 pub fn serialize_frame_type(f: &FrameType) -> u8 {