qwjyh/endcap-sl-software-ri-generator
1
0
Fork 0
mirror of https://gitlab.cern.ch/wotsubo/endcap-sl-software-ri-generator.git synced 2025-08-05 10:19:30 +09:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix clippy lints

Browse source
This commit is contained in:
Wataru Otsubo 2025-07-31 17:20:24 +09:00
parent a9b1d92c7b
commit a456bf64df
5 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/generator.rs
View file

@ -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()),
)
}

38
src/generator/codegen_register.rs
View file

@ -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 {

18
src/io.rs
View file

@ -45,7 +45,8 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
.current_dir(xml_path.parent().unwrap())
.output()
.map_err(|e| XmlGitInfoError::git_command_spawn_error(e, "git describe"))?;
let describe = if out_describe.status.success() {
if out_describe.status.success() {
String::from_utf8_lossy(&out_describe.stdout)
.trim()
.to_owned()
@ -54,8 +55,7 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
msg: "git describe",
stderr: String::from_utf8_lossy(&out_describe.stderr).into_owned(),
});
};
describe
}
}
};
let timestamp = match env::var(ENVVAR_XML_GIT_TIMESTAMP) {
@ -72,7 +72,8 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
.current_dir(xml_path.parent().unwrap())
.output()
.map_err(|e| XmlGitInfoError::git_command_spawn_error(e, "git log (timestamp)"))?;
let timestamp = if timestamp_out.status.success() {
if timestamp_out.status.success() {
String::from_utf8_lossy(&timestamp_out.stdout)
.trim()
.to_owned()
@ -81,8 +82,7 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
msg: "git log (timestamp)",
stderr: String::from_utf8_lossy(&timestamp_out.stderr).into_owned(),
});
};
timestamp
}
}
};
let git_sha = match env::var(ENVVAR_XML_GIT_SHA) {
@ -99,15 +99,15 @@ pub(crate) fn get_xml_gitinfo(xml_path: &path::Path) -> Result<XmlGitInfo, XmlGi
.current_dir(xml_path.parent().unwrap())
.output()
.map_err(|e| XmlGitInfoError::git_command_spawn_error(e, "git rev-parse (sha)"))?;
let git_sha = if sha.status.success() {
if sha.status.success() {
String::from_utf8_lossy(&sha.stdout).trim().to_owned()
} else {
return Err(XmlGitInfoError::CommandFailed {
msg: "git rev-parse (sha)",
stderr: String::from_utf8_lossy(&sha.stderr).into_owned(),
});
};
git_sha
}
}
};
Ok(XmlGitInfo {

2
src/type_traits.rs
View file

@ -38,6 +38,6 @@ impl Display for RwSpecifier {
RwSpecifier::W => "w",
RwSpecifier::RW => "rw",
};
write!(f, "{}", s)
write!(f, "{s}")
}
}

12
src/validator.rs
View file

@ -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()