fix(volo-build): not add vologen prefix for rust type

cloudwego · Nov 5, 2024 · d7b77de · d7b77de
1 parent 70e89bd
commit d7b77de
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,12 +24,12 @@ license = "MIT OR Apache-2.0"
 rust-version = "1.80.0"
 
 [workspace.dependencies]
-pilota = "0.11"
-pilota-build = "0.11"
-pilota-thrift-parser = "0.11"
-# pilota = { git = "https://github.com/cloudwego/pilota", branch = "main" }
-# pilota-build = { git = "https://github.com/cloudwego/pilota", branch = "main" }
-# pilota-thrift-parser = { git = "https://github.com/cloudwego/pilota", branch = "main" }
+# pilota = "0.11"
+# pilota-build = "0.11"
+# pilota-thrift-parser = "0.11"
+pilota = { git = "https://github.com/cloudwego/pilota", branch = "fix/method_name_start_with_underscore" }
+pilota-build = { git = "https://github.com/cloudwego/pilota", branch = "fix/method_name_start_with_underscore" }
+pilota-thrift-parser = { git = "https://github.com/cloudwego/pilota", branch = "fix/method_name_start_with_underscore" }
 
 motore = "0.4"
 # motore = { git = "https://github.com/cloudwego/motore", branch = "main" }

diff --git a/volo-build/Cargo.toml b/volo-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volo-build"
-version = "0.10.15"
+version = "0.10.16"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

diff --git a/volo-build/src/thrift_backend.rs b/volo-build/src/thrift_backend.rs
@@ -667,7 +667,11 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
             .map(|a| {
                 let ty = self.inner.codegen_item_ty(a.ty.kind.clone()).global_path();
                 let ident = self.cx().rust_name(a.def_id).0.field_ident(); // use the _{rust-style fieldname} without keyword escaping
-                format!("_{ident}: volo_gen{ty}")
+                if need_prepend_volo_gen_path(&a.ty.kind) {
+                    format!("_{ident}: volo_gen{ty}")
+                } else {
+                    format!("_{ident}: {ty}")
+                }
             })
             .join(",");