codegen: Fix issues reported by cargo clippy

Fix all issues reported by cargo clippy to make ci testing pass.

Signed-off-by: Xuewei Niu <[email protected]>

Author: justxuewei

Makefile

@@ -1,3 +1,5 @@
+export PROTOC=${HOME}/protoc/bin/protoc
+
 all: debug test
 
 #

codegen/src/codegen.rs

@@ -48,8 +48,7 @@ where
         let fd_set = FileDescriptorSet::decode(&buffer as &[u8]).context("Decode fd_set")?;
 
         for fd in fd_set.file.iter() {
-            let rs_path =
-                PathBuf::from(self.out_dir.as_ref()).join(&format!("{}.rs", fd.package()));
+            let rs_path = PathBuf::from(self.out_dir.as_ref()).join(format!("{}.rs", fd.package()));
             let mut f = match File::open(&rs_path) {
                 Ok(f) => f,
                 _ => continue,
@@ -169,20 +168,14 @@ where
             None => return Err(anyhow!("The includes are required.")),
         };
 
-        let serde = match self.serde {
-            Some(serde) => serde,
-            None => false,
-        };
+        let serde = self.serde.unwrap_or(false);
 
         let async_mode = match self.async_mode {
             Some(mode) => mode,
             None => AsyncMode::None,
         };
 
-        let generate_service = match self.generate_service {
-            Some(gen) => gen,
-            None => false,
-        };
+        let generate_service = self.generate_service.unwrap_or(false);
 
         Ok(Codegen {
             out_dir,

codegen/src/svcgen.rs

@@ -253,7 +253,7 @@ impl TtrpcServiceGenerator {
             quote!( let streams = HashMap::new(); )
         };
         let method_inserts: Vec<_> = service.methods.iter().map(|method| {
-            let key = format!("{}", method.proto_name);
+            let key = method.proto_name.to_string();
             let mm = format_ident!("{}Method", to_camel_case(&method.proto_name));
             match MethodType::from_method(method) {
                 MethodType::Unary => {
@@ -349,7 +349,7 @@ impl TtrpcServiceGenerator {
         let input = type_token(&method.input_type);
         let output = type_token(&method.output_type);
         let server_str = format!("{}.{}", service.package, service.name);
-        let method_str = format!("{}", method.proto_name);
+        let method_str = method.proto_name.to_string();
 
         match MethodType::from_method(method) {
             MethodType::Unary => {
@@ -373,7 +373,7 @@ impl TtrpcServiceGenerator {
         let input = type_token(&method.input_type);
         let output = type_token(&method.output_type);
         let server_str = format!("{}.{}", service.package, service.name);
-        let method_str = format!("{}", method.proto_name);
+        let method_str = method.proto_name.to_string();
 
         let (mut arg_tokens, ret_token, body_token) = match MethodType::from_method(method) {
             MethodType::Unary => (
@@ -497,7 +497,7 @@ enum Side {
 }
 
 fn async_on(mode: AsyncMode, side: Side) -> bool {
-    return mode == AsyncMode::All
+    mode == AsyncMode::All
         || (side == Side::Server && mode == AsyncMode::Server)
-        || (side == Side::Client && mode == AsyncMode::Client);
+        || (side == Side::Client && mode == AsyncMode::Client)
 }

codegen/src/util.rs

@@ -33,7 +33,7 @@ impl<'a> Iterator for NameSpliter<'a> {
         let mut meet_lower = false;
         for i in self.pos..self.name.len() {
             let c = self.name[i];
-            if b'A' <= c && c <= b'Z' {
+            if (b'A'..=b'Z').contains(&c) {
                 if meet_lower {
                     // So it should be AaA or aaA
                     pos = i;

example2/Makefile

@@ -1,3 +1,5 @@
+export PROTOC=${HOME}/protoc/bin/protoc
+
 #
 # Build
 #
@@ -20,3 +22,4 @@ deps:
 	rustup update stable
 	rustup default stable
 	rustup component add rustfmt clippy
+	../install_protoc.sh