fix(volo-build): escape keywords in code generation for idl service method arguments

examples/src/thrift/hello/client.rs

@@ -25,4 +25,35 @@ async fn main() {
         Ok(info) => println!("{info:?}"),
         Err(e) => eprintln!("{e:?}"),
     }
+
+    let req = volo_gen::thrift_gen::hello::HelloRequest {
+        name: "volo".into(),
+        common: None,
+        common2: None,
+    };
+
+    let resp = CLIENT
+        .clone()
+        .with_callopt(CallOpt::default())
+        .hello2(req)
+        .await;
+    match resp {
+        Ok(info) => println!("{info:?}"),
+        Err(e) => eprintln!("{e:?}"),
+    }
+
+    let req = volo_gen::thrift_gen::hello::HelloRequest {
+        name: "volo".into(),
+        common: None,
+        common2: None,
+    };
+    let resp = CLIENT
+        .clone()
+        .with_callopt(CallOpt::default())
+        .hello3(req)
+        .await;
+    match resp {
+        Ok(info) => println!("{info:?}"),
+        Err(e) => eprintln!("{e:?}"),
+    }
 }

examples/src/thrift/hello/server.rs

@@ -12,6 +12,26 @@ impl volo_gen::thrift_gen::hello::HelloService for S {
         };
         Ok(resp)
     }
+
+    async fn hello2(
+        &self,
+        r#type: volo_gen::thrift_gen::hello::HelloRequest,
+    ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
+        let resp = volo_gen::thrift_gen::hello::HelloResponse {
+            message: format!("Hello2, {}!", r#type.name).into(),
+        };
+        Ok(resp)
+    }
+
+    async fn hello3(
+        &self,
+        self_: volo_gen::thrift_gen::hello::HelloRequest,
+    ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
+        let resp = volo_gen::thrift_gen::hello::HelloResponse {
+            message: format!("Hello3, {}!", self_.name).into(),
+        };
+        Ok(resp)
+    }
 }
 
 #[volo::main]

examples/src/thrift/hello/server_panic.rs

@@ -11,6 +11,21 @@ impl volo_gen::thrift_gen::hello::HelloService for S {
     ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
         panic!("panic in hello");
     }
+
+    async fn hello2(
+        &self,
+        _type: volo_gen::thrift_gen::hello::HelloRequest,
+    ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
+        panic!("panic in hello");
+    }
+
+    #[allow(clippy::duplicate_underscore_argument)]
+    async fn hello3(
+        &self,
+        _self: volo_gen::thrift_gen::hello::HelloRequest,
+    ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
+        panic!("panic in hello");
+    }
 }
 
 #[volo::main]

examples/src/thrift/multiplex/server.rs

@@ -12,6 +12,20 @@ impl volo_gen::thrift_gen::hello::HelloService for S {
         };
         Ok(resp)
     }
+
+    async fn hello2(
+        &self,
+        _req: volo_gen::thrift_gen::hello::HelloRequest,
+    ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
+        panic!("panic in hello");
+    }
+
+    async fn hello3(
+        &self,
+        _req: volo_gen::thrift_gen::hello::HelloRequest,
+    ) -> Result<volo_gen::thrift_gen::hello::HelloResponse, volo_thrift::ServerError> {
+        panic!("panic in hello");
+    }
 }
 
 #[volo::main]

examples/thrift/hello.thrift

@@ -14,4 +14,6 @@ struct HelloResponse {
 
 service HelloService {
     HelloResponse Hello (1: HelloRequest req),
+    HelloResponse Hello2 (1: HelloRequest type),
+    HelloResponse Hello3 (1: HelloRequest self),
 }

volo-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "volo-build"
-version = "0.10.14"
+version = "0.10.15"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

volo-build/src/thrift_backend.rs

@@ -376,7 +376,7 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
             let name = self.cx().rust_name(m.def_id);
             let resp_type = self.cx().codegen_item_ty(m.ret.kind.clone());
             let req_fields = m.args.iter().map(|a| {
-                let name = self.cx().rust_name(a.def_id).0.field_ident();
+                let name = self.cx().rust_name(a.def_id); // use the rust name as string format which will escape the keyword
                 let ty = self.cx().codegen_item_ty(a.ty.kind.clone());
                 let mut ty = format!("{ty}");
                 if let Some(RustWrapperArc(true)) = self.cx().tags(a.tags_id).as_ref().and_then(|tags| tags.get::<RustWrapperArc>()) {
@@ -393,7 +393,7 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
             } else {
                 "None => unreachable!()"
             };
-            let req_field_names = m.args.iter().map(|a| self.cx().rust_name(a.def_id).0.field_ident()).join(",");
+            let req_field_names = m.args.iter().map(|a| self.cx().rust_name(a.def_id)).join(","); // use the rust name as string format which will escape the keyword
             let anonymous_args_send_name = self.method_args_path(&service_name, m, true);
             let exception = if let Some(p) = &m.exceptions {
                 self.cx().cur_related_item_path(p.did)
@@ -477,7 +477,7 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
                 let args = m
                     .args
                     .iter()
-                    .map(|a| format!("args.{}", self.cx().rust_name(a.def_id).0.field_ident()))
+                    .map(|a| format!("args.{}", self.cx().rust_name(a.def_id))) // use the rust name as string format which will escape the keyword
                     .join(",");
 
                 let has_exception = m.exceptions.is_some();
@@ -623,7 +623,7 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
             .iter()
             .map(|a| {
                 let ty = self.inner.codegen_item_ty(a.ty.kind.clone());
-                let ident = self.cx().rust_name(a.def_id).0.field_ident();
+                let ident = self.cx().rust_name(a.def_id); // use the rust name as string format which will escape the keyword
                 format!("{ident}: {ty}")
             })
             .join(",");
@@ -666,7 +666,7 @@ impl pilota_build::CodegenBackend for VoloThriftBackend {
             .iter()
             .map(|a| {
                 let ty = self.inner.codegen_item_ty(a.ty.kind.clone()).global_path();
-                let ident = self.cx().rust_name(a.def_id);
+                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}")
             })
             .join(",");

volo-http/src/server/route.rs

@@ -479,7 +479,10 @@ impl Matcher {
         Ok(())
     }
 
-    fn at<'a>(&'a self, path: &'a str) -> Result<matchit::Match<&RouteId>, MatcherError> {
+    fn at<'a>(
+        &'a self,
+        path: &'a str,
+    ) -> Result<matchit::Match<'a, 'a, &'a RouteId>, MatcherError> {
         self.router.at(path).map_err(MatcherError::RouterMatchError)
     }
 }