Detach codec

Author: ivanlele

Haskell-Generate/GenRustJets.hs

@@ -212,7 +212,7 @@ rustJetCJetPtr mod = vsep $
 
 rustJetEncode :: Module -> Doc a
 rustJetEncode mod =
-  "fn encode<W: Write>(&self, w: &mut BitWriter<W>) -> std::io::Result<usize>" <+>
+  "fn encode(&self, w: &mut BitWriter<&mut dyn Write>) -> std::io::Result<usize>" <+>
   nestBraces ("let (n, len) = match self" <+>
     nestBraces (vsep (foldMapWithPath item (moduleCodes mod))) <> semi <-> line <> "w.write_bits_be(n, len)")
  where
@@ -223,9 +223,10 @@ rustJetEncode mod =
 
 rustJetDecode :: Module -> Doc a
 rustJetDecode mod =
-  "fn decode<I: Iterator<Item = u8>>(bits: &mut BitIter<I>) -> Result<Self, decode::Error>" <+>
+  pretty ("pub(crate) fn decode<I: Iterator<Item = u8>>(bits: &mut BitIter<I>) -> Result<" ++ modname ++ ", decode::Error>") <+>
   nestBraces ("decode_bits!(bits," <+> braces (docTree (moduleCodes mod)) <> ")")
  where
+  modname = rustModuleName mod
   docTree Dead = mempty
   docTree (Leaf (SomeArrow jet)) = pretty (rustModuleName mod ++ "::" ++ jetName jet)
   docTree (Branch l r) = nest 4
@@ -259,7 +260,6 @@ rustJetImpl mod = vsep $
     , rustJetSourceTy mod
     , rustJetTargetTy mod
     , rustJetEncode mod
-    , rustJetDecode mod
     , rustJetCost mod
     ])
   , "}"
@@ -350,6 +350,7 @@ rustJetDoc mod = layoutPretty layoutOptions $ vsep (map (<> line)
   , rustJetDisplay mod
   , rustJetFromStr mod
   , rustJetCJetPtr mod
+  , rustJetDecode mod
   ])
 
 rustFFIImports :: Doc a