fix(volo-build): oneway init service build failed (#405)

* fix(volo-build): oneway init service build failed * update dep
cloudwego · Apr 8, 2024 · cf308c4 · cf308c4
1 parent a0e28dd
commit cf308c4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/volo-build/Cargo.toml b/volo-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volo-build"
-version = "0.10.2"
+version = "0.10.3"
 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
@@ -1,6 +1,10 @@
 use itertools::Itertools;
 use pilota_build::{
-    codegen::thrift::DecodeHelper, db::RirDatabase, rir, rir::Method, tags::RustWrapperArc,
+    codegen::thrift::DecodeHelper,
+    db::RirDatabase,
+    rir::{self, Method},
+    tags::RustWrapperArc,
+    ty::TyKind,
     CodegenBackend, Context, DefId, IdentName, Symbol, ThriftBackend,
 };
 use quote::format_ident;
@@ -639,11 +643,14 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
         method: &Method,
     ) -> String {
         let name = self.cx().rust_name(method.def_id);
-        let ret_ty = self
+        let mut ret_ty = self
             .inner
             .codegen_item_ty(method.ret.kind.clone())
-            .global_path();
-        let mut ret_ty = format!("volo_gen{ret_ty}");
+            .global_path()
+            .to_string();
+        if need_prepend_volo_gen_path(&method.ret.kind) {
+            ret_ty = format!("volo_gen{ret_ty}");
+        }
         if let Some(RustWrapperArc(true)) = self
             .cx()
             .tags(method.ret.tags_id)
@@ -688,6 +695,14 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
     }
 }
 
+fn need_prepend_volo_gen_path(ty: &TyKind) -> bool {
+    match ty {
+        TyKind::Arc(t) => need_prepend_volo_gen_path(&t.kind),
+        TyKind::Path(_) => true,
+        _ => false,
+    }
+}
+
 pub struct MkThriftBackend;
 
 impl pilota_build::MakeBackend for MkThriftBackend {