From e95f884e4422b0498ec50ff285edaac633d496c8 Mon Sep 17 00:00:00 2001 From: pep Date: Sat, 1 Nov 2025 15:55:09 +0100 Subject: [PATCH] parsers: clippy Signed-off-by: pep --- parsers/ChangeLog | 1 + parsers/src/caps.rs | 2 +- parsers/src/data_forms.rs | 8 ++++---- parsers/src/ecaps2.rs | 2 +- parsers/src/message.rs | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/parsers/ChangeLog b/parsers/ChangeLog index 910a4f8dada7b0c4f73a778a8cd4bb03cfd9fc19..c0f3dc71312de04722ef46a3de404758271f51c2 100644 --- a/parsers/ChangeLog +++ b/parsers/ChangeLog @@ -123,6 +123,7 @@ XXXX-YY-ZZ RELEASER - Implement Default for Tune - Re-export xso::error::FromElementError. - Fix a few tests behind 'component' feature + - Fix some Clippy warnings Version 0.21.0: 2024-07-25 Emmanuel Gil Peyrot diff --git a/parsers/src/caps.rs b/parsers/src/caps.rs index addb0da96cc925d1eb075cf3d7987e6e9e1dfc20..5c1624b35e3af6b76e2325ee5ecbc07a24e122c6 100644 --- a/parsers/src/caps.rs +++ b/parsers/src/caps.rs @@ -97,7 +97,7 @@ fn compute_identities(identities: &[Identity]) -> Vec { fn compute_extensions(extensions: &[DataForm]) -> Vec { compute_items(extensions, |extension| { // TODO: maybe handle the error case? - let mut bytes = if let Some(ref form_type) = extension.form_type() { + let mut bytes = if let Some(form_type) = extension.form_type() { form_type.as_bytes().to_vec() } else { vec![] diff --git a/parsers/src/data_forms.rs b/parsers/src/data_forms.rs index 93533f1e4dd2a74fed4113769ca59b6a5832ee05..b469385ca654c516450c09bf667a936d9bbdd323 100644 --- a/parsers/src/data_forms.rs +++ b/parsers/src/data_forms.rs @@ -70,11 +70,11 @@ generate_attribute!( fn validate_field(field: &mut Field) -> Result<(), Error> { if field.type_ != FieldType::Fixed && field.var.is_none() { - return Err(Error::Other("Required attribute 'var' missing.").into()); + return Err(Error::Other("Required attribute 'var' missing.")); } if !field.is_list() && field.options.len() > 0 { - return Err(Error::Other("Option element found in non-list field.").into()); + return Err(Error::Other("Option element found in non-list field.")); } Ok(()) @@ -239,7 +239,7 @@ fn patch_form(form: &mut DataForm) -> Result<(), Error> { } if field.values.len() != 1 { - return Err(Error::Other("Wrong number of values in FORM_TYPE.").into()); + return Err(Error::Other("Wrong number of values in FORM_TYPE.")); } form_type_index = Some(i); @@ -274,7 +274,7 @@ impl DataForm { pub fn form_type(&self) -> Option<&str> { for field in self.fields.iter() { if field.is_form_type(&self.type_) { - return field.values.get(0).map(|x| x.as_str()); + return field.values.first().map(|x| x.as_str()); } } None diff --git a/parsers/src/ecaps2.rs b/parsers/src/ecaps2.rs index 1d45c2bef6873227a92e256c2556145ff4b19ef7..a2bb3048fc5093b4318843e152dae2c0155c7897 100644 --- a/parsers/src/ecaps2.rs +++ b/parsers/src/ecaps2.rs @@ -92,7 +92,7 @@ fn compute_extensions(extensions: &[DataForm]) -> Result, Error> { Ok(compute_items(extensions, 0x1c, |extension| { let mut bytes = compute_item("FORM_TYPE"); bytes.append(&mut compute_item( - if let Some(ref form_type) = extension.form_type() { + if let Some(form_type) = extension.form_type() { form_type } else { unreachable!() diff --git a/parsers/src/message.rs b/parsers/src/message.rs index c02681e29d91f08d140c06050849db6fd8dcecd4..b6b8059a4c89e0dc146d0ebfa5875f7f473ddc0d 100644 --- a/parsers/src/message.rs +++ b/parsers/src/message.rs @@ -71,7 +71,7 @@ impl DerefMut for Lang { } impl fmt::Display for Lang { - fn fmt<'f>(&self, f: &'f mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Display::fmt(&self.0, f) } }