Merge pull request #183 from Tim-Zhang/update-ttrpc-codegen

Update ttrpc-codegen

Author: Tim-Zhang

ttrpc-codegen/Cargo.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 
 
 [dependencies]
-protobuf-support = "3.1.0"
+protobuf-support = "3.2.0"
 protobuf = { version = "2.27.1" }
-protobuf-codegen = "3.1.0"
+protobuf-codegen = "3.2.0"
 ttrpc-compiler = "0.6.1"

ttrpc-codegen/src/lib.rs

@@ -23,7 +23,9 @@
 //!        .expect("Gen async code failed.");
 //! }
 
-pub use protobuf_codegen::Customize as ProtobufCustomize;
+pub use protobuf_codegen::{
+    Customize as ProtobufCustomize, CustomizeCallback as ProtobufCustomizeCallback,
+};
 use std::collections::HashMap;
 use std::error::Error;
 use std::fmt;
@@ -50,8 +52,8 @@ pub struct Codegen {
     inputs: Vec<PathBuf>,
     /// Generate rust-protobuf files along with rust-gprc
     rust_protobuf: bool,
-    /// Customize rust-protobuf codegen
-    pub rust_protobuf_customize: ProtobufCustomize,
+    /// rust protobuf codegen
+    rust_protobuf_codegen: protobuf_codegen::Codegen,
     /// Customize code generation
     customize: Customize,
 }
@@ -102,9 +104,18 @@ impl Codegen {
         self
     }
 
-    /// Customize code generated by rust-protobuf.
+    /// Customize code generated by rust-protobuf-codegen.
     pub fn rust_protobuf_customize(&mut self, customize: ProtobufCustomize) -> &mut Self {
-        self.rust_protobuf_customize = customize;
+        self.rust_protobuf_codegen.customize(customize);
+        self
+    }
+
+    /// Callback for dynamic per-element customization of rust-protobuf-codegen.
+    pub fn rust_protobuf_customize_callback(
+        &mut self,
+        customize: impl ProtobufCustomizeCallback,
+    ) -> &mut Self {
+        self.rust_protobuf_codegen.customize_callback(customize);
         self
     }
 
@@ -116,18 +127,17 @@ impl Codegen {
 
     /// Like `protoc --rust_out=...` but without requiring `protoc` or `protoc-gen-rust`
     /// commands in `$PATH`.
-    pub fn run(&self) -> io::Result<()> {
+    pub fn run(&mut self) -> io::Result<()> {
         let includes: Vec<&Path> = self.includes.iter().map(|p| p.as_path()).collect();
         let inputs: Vec<&Path> = self.inputs.iter().map(|p| p.as_path()).collect();
         let p = parse_and_typecheck(&includes, &inputs)?;
 
         if self.rust_protobuf {
-            protobuf_codegen::Codegen::new()
+            self.rust_protobuf_codegen
                 .pure()
                 .out_dir(&self.out_dir)
                 .inputs(&self.inputs)
                 .includes(&self.includes)
-                .customize(self.rust_protobuf_customize.clone())
                 .run()
                 .expect("Gen rust protobuf failed.");
         }