diff --git a/src/generator.rs b/src/generator.rs index 310b9dc..2cb0aa2 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -424,7 +424,7 @@ fn mod_file_path( mod_snake_case_name: &proc_macro2::Ident, ) -> (path::PathBuf, path::PathBuf) { ( - parent_path.join(format!("{}.rs", mod_snake_case_name)), + parent_path.join(format!("{mod_snake_case_name}.rs")), parent_path.join(mod_snake_case_name.to_string()), ) } diff --git a/src/generator/codegen_register.rs b/src/generator/codegen_register.rs index fea2d10..e9fa510 100644 --- a/src/generator/codegen_register.rs +++ b/src/generator/codegen_register.rs @@ -233,7 +233,7 @@ fn generate_single_field( snake_case_name: Ident, desc: &str, ) -> (TokenStream, TokenStream, TokenStream) { - let mask_val = util::parse_to_literal(&format!("0x{:x}", mask_val)).unwrap(); + let mask_val = util::parse_to_literal(&format!("0x{mask_val:x}")).unwrap(); let code_mask = match field_type { FieldType::RustType(_) => { quote! { @@ -270,15 +270,15 @@ fn generate_single_bool_field( snake_case_name: Ident, desc: &str, ) -> (TokenStream, TokenStream) { - let setter_name = util::parse_to_ident(&format!("set_{}", snake_case_name)).unwrap(); - let getter_doc = format!("Getter. {}", desc); + let setter_name = util::parse_to_ident(&format!("set_{snake_case_name}")).unwrap(); + let getter_doc = format!("Getter. {desc}"); let code_getter = quote! { #[doc = #getter_doc] pub fn #snake_case_name(&self) -> bool { (self.inner & #mask_name) == #mask_name } }; - let setter_doc = format!("Setter. {}", desc); + let setter_doc = format!("Setter. {desc}"); let code_setter = quote! { #[doc = #setter_doc] pub fn #setter_name(self, val: bool) -> Self { @@ -303,9 +303,9 @@ fn generate_single_ux_field( desc: &str, ) -> (TokenStream, TokenStream) { let field_type = field_type.to_rust_type_token(); - let setter_name = util::parse_to_ident(&format!("set_{}", snake_case_name)).unwrap(); + let setter_name = util::parse_to_ident(&format!("set_{snake_case_name}")).unwrap(); - let getter_doc = format!("Getter. {}", desc); + let getter_doc = format!("Getter. {desc}"); let code_getter = quote! { #[doc = #getter_doc] pub fn #snake_case_name(&self) -> #field_type { @@ -315,7 +315,7 @@ fn generate_single_ux_field( .unwrap() } }; - let setter_doc = format!("Setter. {}", desc); + let setter_doc = format!("Setter. {desc}"); let code_setter = quote! { #[doc = #setter_doc] pub fn #setter_name(&self, val: #field_type) -> Self { @@ -378,7 +378,7 @@ fn generate_single_custom_values_field( values: &[Value], desc: &str, ) -> (TokenStream, TokenStream) { - let setter_name = util::parse_to_ident(&format!("set_{}", snake_case_name)).unwrap(); + let setter_name = util::parse_to_ident(&format!("set_{snake_case_name}")).unwrap(); let value_enum_name = util::parse_to_ident(&snake_case_name.to_string().to_upper_camel_case()).unwrap(); let (getter_match_arms, setter_match_arms): (Vec<_>, Vec<_>) = values @@ -397,7 +397,7 @@ fn generate_single_custom_values_field( }) .unzip(); - let getter_doc = format!("Getter. {}", desc); + let getter_doc = format!("Getter. {desc}"); let code_getter = quote! { #[doc = #getter_doc] pub fn #snake_case_name(&self) -> #value_enum_name { @@ -410,7 +410,7 @@ fn generate_single_custom_values_field( } }; - let setter_doc = format!("Setter. {}", desc); + let setter_doc = format!("Setter. {desc}"); let code_setter = quote! { #[doc = #setter_doc] pub fn #setter_name(self, val: #value_enum_name) -> Self { @@ -508,7 +508,7 @@ fn generate_multiple_bool_field( (self.inner & #mask_name[#i]) == #mask_name[#i] } }); - let getter_doc = format!("Getter. {}", desc); + let getter_doc = format!("Getter. {desc}"); let code_getter = quote! { #[doc = #getter_doc] pub fn #snake_case_name(&self) -> [bool; #num_multiple] { @@ -518,8 +518,8 @@ fn generate_multiple_bool_field( } }; - let setter_name = util::parse_to_ident(&format!("set_{}", snake_case_name)).unwrap(); - let setter_doc = format!("Setter. {}", desc); + let setter_name = util::parse_to_ident(&format!("set_{snake_case_name}")).unwrap(); + let setter_doc = format!("Setter. {desc}"); let code_setter = quote! { #[doc = #setter_doc] pub fn #setter_name(self, val: [bool; #num_multiple]) -> Self { @@ -558,7 +558,7 @@ fn generate_multiple_ux_field( .unwrap() } }); - let getter_doc = format!("Getter. {}", desc); + let getter_doc = format!("Getter. {desc}"); let code_getter = quote! { #[doc = #getter_doc] pub fn #snake_case_name(&self) -> [#field_type; #num_multiple] { @@ -568,8 +568,8 @@ fn generate_multiple_ux_field( } }; - let setter_name = util::parse_to_ident(&format!("set_{}", snake_case_name)).unwrap(); - let setter_doc = format!("Setter. {}", desc); + let setter_name = util::parse_to_ident(&format!("set_{snake_case_name}")).unwrap(); + let setter_doc = format!("Setter. {desc}"); let code_setter = quote! { #[doc = #setter_doc] pub fn #setter_name(&self, val: [#field_type; #num_multiple]) -> Self { @@ -627,7 +627,7 @@ fn generate_multiple_custom_values_field( } } }); - let getter_doc = format!("Getter. {}", desc); + let getter_doc = format!("Getter. {desc}"); let code_getter = quote! { #[doc = #getter_doc] pub fn #snake_case_name(&self) -> [#value_enum_name; #num_multiple] { @@ -637,7 +637,7 @@ fn generate_multiple_custom_values_field( } }; - let setter_name = util::parse_to_ident(&format!("set_{}", snake_case_name)).unwrap(); + let setter_name = util::parse_to_ident(&format!("set_{snake_case_name}")).unwrap(); let elem_setter = masks.iter().enumerate().map(|(i, _mask)| { quote! { match val[#i] { @@ -645,7 +645,7 @@ fn generate_multiple_custom_values_field( } } }); - let setter_doc = format!("Setter. {}", desc); + let setter_doc = format!("Setter. {desc}"); let code_setter = quote! { #[doc = #setter_doc] pub fn #setter_name(&self, val: [#value_enum_name; #num_multiple]) -> Self { diff --git a/src/io.rs b/src/io.rs index f87edc5..1043c63 100644 --- a/src/io.rs +++ b/src/io.rs @@ -45,7 +45,8 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result Result Result Result Result "w", RwSpecifier::RW => "rw", }; - write!(f, "{}", s) + write!(f, "{s}") } } diff --git a/src/validator.rs b/src/validator.rs index 74aa4c3..46b4cf4 100644 --- a/src/validator.rs +++ b/src/validator.rs @@ -296,7 +296,7 @@ mod test { }; let (maps, errors) = module.validate(); - eprintln!("{:#?}", maps); + eprintln!("{maps:#?}"); eprintln!( "{:#?}", maps.iter().filter(|e| e.is_some()).collect_vec().len() @@ -447,7 +447,7 @@ mod test { }; let (maps, errors) = module.validate(); - eprintln!("{:#?}", maps); + eprintln!("{maps:#?}"); eprintln!( "{:#?}", maps.iter().filter(|e| e.is_some()).collect_vec().len() @@ -515,8 +515,8 @@ mod test { }; let (maps, errors) = module.validate(); - eprintln!("{:#?}", maps); - eprintln!("{:#?}", errors); + eprintln!("{maps:#?}"); + eprintln!("{errors:#?}"); eprintln!( "{:#?}", maps.iter().filter(|e| e.is_some()).collect_vec().len() @@ -569,8 +569,8 @@ mod test { }; let (maps, errors) = module.validate(); - eprintln!("{:#?}", maps); - eprintln!("{:#?}", errors); + eprintln!("{maps:#?}"); + eprintln!("{errors:#?}"); eprintln!( "{:#?}", maps.iter().filter(|e| e.is_some()).collect_vec().len()