clippy

Author: Zheoni

src/aisle/mod.rs

@@ -90,7 +90,7 @@ impl AisleConf<'_> {
 
                 for name in &igr.names {
                     let info = IngredientInfo {
-                        name: *name,
+                        name,
                         common_name,
                         category: cat.name,
                     };

src/analysis/event_consumer.rs

@@ -130,7 +130,7 @@ struct Locations<'i> {
 
 const IMPLICIT_REF_WARN: &str = "The reference (&) is implicit";
 
-impl<'i, 'c> RecipeCollector<'i, 'c> {
+impl<'i> RecipeCollector<'i, '_> {
     fn parse_events(mut self, mut events: impl Iterator<Item = Event<'i>>) -> AnalysisResult {
         enum BlockBuffer {
             Step(Vec<Item>),
@@ -247,7 +247,7 @@ impl<'i, 'c> RecipeCollector<'i, 'c> {
                 let mut to_remove = Vec::new();
                 for (key, value) in self.content.metadata.map.iter() {
                     if let Some(sk) = key.as_str().and_then(|s| StdKey::from_str(s).ok()) {
-                        match check_std_entry(sk, value, &self.converter) {
+                        match check_std_entry(sk, value, self.converter) {
                             Ok(Some(servings)) => self.content.data = servings,
                             Ok(None) => {}
                             Err(err) => {

src/convert/mod.rs

@@ -388,7 +388,7 @@ impl BestConversions {
         Some(Arc::clone(&converter.all_units[best_id]))
     }
 
-    fn all_units<'c>(&'c self, converter: &'c Converter) -> impl Iterator<Item = &Arc<Unit>> {
+    fn all_units<'c>(&'c self, converter: &'c Converter) -> impl Iterator<Item = &'c Arc<Unit>> {
         self.0.iter().map(|(_, uid)| &converter.all_units[*uid])
     }
 }

src/metadata.rs

@@ -269,7 +269,7 @@ fn value_as_tags(val: &serde_yaml::Value) -> Result<Vec<&str>, MetadataError> {
     let entries = if let Some(s) = val.as_str() {
         s.split(',').map(|e| e.trim()).collect()
     } else if let Some(seq) = val.as_sequence() {
-        seq.into_iter()
+        seq.iter()
             .map(|val| val.as_str())
             .collect::<Option<Vec<&str>>>()
             .ok_or(MetadataError::UnexpectedType)?

src/model.rs

@@ -252,7 +252,7 @@ impl Ingredient<Value> {
     pub fn all_quantities<'a>(
         &'a self,
         all_ingredients: &'a [Self],
-    ) -> impl Iterator<Item = &ScaledQuantity> {
+    ) -> impl Iterator<Item = &'a ScaledQuantity> {
         std::iter::once(self.quantity.as_ref())
             .chain(
                 self.relation
@@ -332,7 +332,7 @@ impl Cookware<Value> {
     }
 
     /// Gets an iterator over all quantities of this ingredient and its references.
-    pub fn all_amounts<'a>(&'a self, all_cookware: &'a [Self]) -> impl Iterator<Item = &Value> {
+    pub fn all_amounts<'a>(&'a self, all_cookware: &'a [Self]) -> impl Iterator<Item = &'a Value> {
         std::iter::once(self.quantity.as_ref())
             .chain(
                 self.relation
@@ -533,9 +533,9 @@ pub struct Timer<V: QuantityValue = Value> {
     /// If created from parsing the following applies:
     ///
     /// - If the [`ADVANCED_UNITS`](crate::Extensions::ADVANCED_UNITS) extension
-    /// is enabled, this is guaranteed to have a time unit and a non text value.
+    ///   is enabled, this is guaranteed to have a time unit and a non text value.
     ///
     /// - If the [`TIMER_REQUIRES_TIME`](crate::Extensions::TIMER_REQUIRES_TIME)
-    /// extension is enabled, this is guaranteed to be [`Some`].
+    ///   extension is enabled, this is guaranteed to be [`Some`].
     pub quantity: Option<Quantity<V>>,
 }

src/parser/mod.rs

@@ -367,7 +367,7 @@ fn parse_block(block: &mut BlockParser, old_style_metadata: bool) {
                 let key_t = key.text_outer_trimmed();
                 let is_config_key = key_t.starts_with('[') && key_t.ends_with(']');
                 let modes_active = bp.extension(Extensions::MODES);
-                return (is_config_key && modes_active) || old_style_metadata;
+                (is_config_key && modes_active) || old_style_metadata
             })
         }),
         T![=] => block.with_recover(section),

src/parser/token_stream.rs

@@ -22,7 +22,7 @@ impl<'i> TokenStream<'i> {
     }
 }
 
-impl<'i> Iterator for TokenStream<'i> {
+impl Iterator for TokenStream<'_> {
     type Item = Token;
 
     fn next(&mut self) -> Option<Self::Item> {

src/scale.rs

@@ -130,7 +130,7 @@ impl ScalableRecipe {
     pub fn scale(self, target: u32, converter: &Converter) -> ScaledRecipe {
         let target = if let Servings(Some(servings)) = &self.data {
             let base = servings.first().copied().unwrap_or(1);
-            ScaleTarget::new(base, target, &servings)
+            ScaleTarget::new(base, target, servings)
         } else {
             ScaleTarget::new(1, target, &[])
         };