removed some clones

Author: Michael Mileusnich

src/variable_versions/ipfix.rs

@@ -100,17 +100,15 @@ pub struct Set {
 #[derive(Debug, PartialEq, Clone, Serialize, Nom)]
 #[nom(ExtraArgs(parser: &mut IPFixParser, set_id: u16))]
 pub struct Data {
-    #[nom(
-        Parse = "{ |i| parse_fields::<Template>(i, parser.templates.get(&set_id).cloned()) }"
-    )]
+    #[nom(Parse = "{ |i| parse_fields::<Template>(i, parser.templates.get(&set_id)) }")]
     pub data_fields: Vec<BTreeMap<IPFixField, FieldValue>>,
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Nom)]
 #[nom(ExtraArgs(parser: &mut IPFixParser, set_id: u16))]
 pub struct OptionsData {
     #[nom(
-        Parse = "{ |i| parse_fields::<OptionsTemplate>(i, parser.options_templates.get(&set_id).cloned()) }"
+        Parse = "{ |i| parse_fields::<OptionsTemplate>(i, parser.options_templates.get(&set_id)) }"
     )]
     pub data_fields: Vec<BTreeMap<IPFixField, FieldValue>>,
 }
@@ -209,27 +207,28 @@ impl CommonTemplateFields for OptionsTemplate {
 /// Takes a byte stream and a cached template.
 /// Fields get matched to static types.
 /// Returns BTree of IPFix Types & Fields or IResult Error.
-fn parse_fields<T: CommonTemplateFields>(
-    i: &[u8],
-    template: Option<T>,
-) -> IResult<&[u8], Vec<BTreeMap<IPFixField, FieldValue>>> {
+fn parse_fields<'a, T: CommonTemplateFields>(
+    i: &'a [u8],
+    template: Option<&T>,
+) -> IResult<&'a [u8], Vec<BTreeMap<IPFixField, FieldValue>>> {
     let template = match template {
         Some(t) => t,
         None => {
             // dbg!("Could not fetch any v10 templates!");
             return Err(NomErr::Error(NomError::new(i, ErrorKind::Fail)));
         }
     };
+    let template_fields = template.get_fields();
     // If no fields there are no fields to parse
-    if template.get_fields().is_empty() {
+    if template_fields.is_empty() {
         // dbg!("Template without fields!");
         return Err(NomErr::Error(NomError::new(i, ErrorKind::Fail)));
     };
     let mut fields = vec![];
     let mut remaining = i;
     while !remaining.is_empty() {
         let mut data_field = BTreeMap::new();
-        for template_field in template.get_fields().iter() {
+        for template_field in template_fields.iter() {
             let field_type: FieldDataType = template_field.field_type.into();
             // Enterprise Number
             if template_field.enterprise_number.is_some() {
@@ -349,7 +348,7 @@ impl NetflowByteParserVariable for IPFixParser {
                 .checked_sub(remaining.len())
                 .unwrap_or(total_left);
             total_left -= parsed;
-            sets.push(v10_set.clone());
+            sets.push(v10_set);
         }
 
         let v10_parsed = IPFix {

src/variable_versions/v9.rs

@@ -276,7 +276,7 @@ fn get_total_options_length(flow_set_id: u16, length: u16, parser: &mut V9Parser
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Nom)]
-#[nom(ExtraArgs(field: OptionsTemplateScopeField))]
+#[nom(ExtraArgs(field: &OptionsTemplateScopeField))]
 pub struct ScopeDataField {
     /// System
     #[nom(
@@ -328,23 +328,23 @@ pub struct Data {
     /// themselves, as well as the combined lengths of any included data records.
     pub length: u16,
     // Data Fields
-    #[nom(Parse = "{ |i| parse_fields(i, parser.templates.get(&flow_set_id).cloned()) }")]
+    #[nom(Parse = "{ |i| parse_fields(i, parser.templates.get(&flow_set_id)) }")]
     pub data_fields: Vec<BTreeMap<V9Field, FieldValue>>,
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize, Nom)]
-#[nom(ExtraArgs(field: TemplateField))]
+#[nom(ExtraArgs(field: &TemplateField))]
 pub struct OptionDataField {
     #[nom(Value(field.field_type))]
     pub field_type: V9Field,
     #[nom(Map = "|i: &[u8]| i.to_vec()", Take = "field.field_length")]
     pub field_value: Vec<u8>,
 }
 
-fn parse_fields(
-    i: &[u8],
-    template: Option<Template>,
-) -> IResult<&[u8], Vec<BTreeMap<V9Field, FieldValue>>> {
+fn parse_fields<'a>(
+    i: &'a [u8],
+    template: Option<&Template>,
+) -> IResult<&'a [u8], Vec<BTreeMap<V9Field, FieldValue>>> {
     let template = match template {
         Some(t) => t,
         None => {
@@ -457,7 +457,7 @@ fn parse_options_data_fields(
     let mut fields = vec![];
     let mut remaining = i;
     for field in template.option_fields.iter() {
-        let (i, v9_data_field) = OptionDataField::parse(remaining, field.clone())?;
+        let (i, v9_data_field) = OptionDataField::parse(remaining, field)?;
         remaining = i;
         fields.push(v9_data_field)
     }
@@ -476,7 +476,7 @@ fn parse_scope_data_fields(
     let mut fields = vec![];
     let mut remaining = i;
     for field in template.scope_fields.iter() {
-        let (i, v9_data_field) = ScopeDataField::parse(remaining, field.clone())?;
+        let (i, v9_data_field) = ScopeDataField::parse(remaining, field)?;
         remaining = i;
         fields.push(v9_data_field)
     }