[ISSUE #1476]♻️Refactor derive RequestHeaderCodec parse logic🔥

mxsm · mxsm · commit adf4c7861443 · 2024-12-01T14:33:51.000+08:00
diff --git a/rocketmq-macros/src/request_header_custom.rs b/rocketmq-macros/src/request_header_custom.rs
@@ -66,7 +66,7 @@ pub(super) fn request_header_codec_inner(
                 field_name.span(),
             );
             let type_name = if let Some(value) = &has_option {
-                get_type_name(*value)
+                get_type_name(value)
             } else {
                 get_type_name(&field.ty)
             };
@@ -75,7 +75,7 @@ pub(super) fn request_header_codec_inner(
                       const #static_name: &'static str = #camel_case_name;
                   },
                 (
-                    if let Some(_) = has_option {
+                    if has_option.is_some()  {
                         if type_name == "CheetahString" {
                             quote! {
                                   if let Some(ref value) = self.#field_name {
@@ -104,8 +104,7 @@ pub(super) fn request_header_codec_inner(
                                    }
                               }
                         }
-                    } else {
-                        if type_name == "CheetahString" {
+                    } else if type_name == "CheetahString" {
                             quote! {
                                      map.insert (
                                           cheetah_string::CheetahString::from_static_str(Self::#static_name),
@@ -127,7 +126,7 @@ pub(super) fn request_header_codec_inner(
                                  );
                               }
                         }
-                    },
+                    ,
                     // build FromMap impl
                     if let Some(value) = has_option {
                         if type_name == "CheetahString" || type_name == "String" {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ pub(super) fn request_header_codec_inner(`
`66`	`66`	`field_name.span(),`
`67`	`67`	`);`
`68`	`68`	`let type_name = if let Some(value) = &has_option {`
`69`		`- get_type_name(*value)`
	`69`	`+ get_type_name(value)`
`70`	`70`	`} else {`
`71`	`71`	`get_type_name(&field.ty)`
`72`	`72`	`};`
`@@ -75,7 +75,7 @@ pub(super) fn request_header_codec_inner(`
`75`	`75`	`const #static_name: &'static str = #camel_case_name;`
`76`	`76`	`},`
`77`	`77`	`(`
`78`		`- if let Some(_) = has_option {`
	`78`	`+ if has_option.is_some() {`
`79`	`79`	`if type_name == "CheetahString" {`
`80`	`80`	`quote! {`
`81`	`81`	`if let Some(ref value) = self.#field_name {`
`@@ -104,8 +104,7 @@ pub(super) fn request_header_codec_inner(`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`- } else {`
`108`		`- if type_name == "CheetahString" {`
	`107`	`+ } else if type_name == "CheetahString" {`
`109`	`108`	`quote! {`
`110`	`109`	`map.insert (`
`111`	`110`	`cheetah_string::CheetahString::from_static_str(Self::#static_name),`
`@@ -127,7 +126,7 @@ pub(super) fn request_header_codec_inner(`
`127`	`126`	`);`
`128`	`127`	`}`
`129`	`128`	`}`
`130`		`- },`
	`129`	`+ ,`
`131`	`130`	`// build FromMap impl`
`132`	`131`	`if let Some(value) = has_option {`
`133`	`132`	`if type_name == "CheetahString" \|\| type_name == "String" {`