parent implementation and cleanup

src/validator/cbor.rs

@@ -142,7 +142,7 @@ pub struct CBORValidator<'a> {
   cddl_location: String,
   cbor_location: String,
   // Occurrence indicator detected in current state of AST evaluation
-  occurrence: Option<Occur<'a>>,
+  occurrence: Option<Occur>,
   // Current group entry index detected in current state of AST evaluation
   group_entry_idx: Option<usize>,
   // cbor object value hoisted from previous state of AST evaluation
@@ -175,7 +175,7 @@ pub struct CBORValidator<'a> {
   advance_to_next_entry: bool,
   // Is validation checking for map quality
   is_ctrl_map_equality: bool,
-  entry_counts: Option<Vec<EntryCount<'a>>>,
+  entry_counts: Option<Vec<EntryCount>>,
   // Collect map entry keys that have already been validated
   validated_keys: Option<Vec<Value>>,
   // Collect map entry values that have yet to be validated

src/validator/control.rs

@@ -865,8 +865,6 @@ mod tests {
         value: "foo\n  bar\n  baz\n".into(),
         #[cfg(feature = "ast-span")]
         span: Span::default(),
-        #[cfg(feature = "ast-parent")]
-        parent: None,
       }],
     );
 
@@ -897,17 +895,13 @@ mod tests {
           generic_args: None,
           #[cfg(feature = "ast-span")]
           span: Span::default(),
-          #[cfg(feature = "ast-parent")]
-          parent: None,
         },
         true,
       )?,
       vec![Type2::TextValue {
         value: "foo\nbar\nbaz\n".into(),
         #[cfg(feature = "ast-span")]
         span: Span::default(),
-        #[cfg(feature = "ast-parent")]
-        parent: None,
       }]
     );
 

src/validator/json.rs

@@ -161,7 +161,7 @@ pub struct JSONValidator<'a> {
   cddl_location: String,
   json_location: String,
   // Occurrence indicator detected in current state of AST evaluation
-  occurrence: Option<Occur<'a>>,
+  occurrence: Option<Occur>,
   // Current group entry index detected in current state of AST evaluation
   group_entry_idx: Option<usize>,
   // JSON object value hoisted from previous state of AST evaluation
@@ -193,7 +193,7 @@ pub struct JSONValidator<'a> {
   // fails as detected during the current state of AST evaluation
   advance_to_next_entry: bool,
   is_ctrl_map_equality: bool,
-  entry_counts: Option<Vec<EntryCount<'a>>>,
+  entry_counts: Option<Vec<EntryCount>>,
   // Collect map entry keys that have already been validated
   validated_keys: Option<Vec<String>>,
   // Collect map entry values that have yet to be validated

src/validator/mod.rs

@@ -942,7 +942,7 @@ pub fn validate_array_occurrence<'de, T: Deserialize<'de>>(
 /// entries in arrays, but may be useful in other contexts. The occurrence is
 /// only captured for the second element of the CDDL array to avoid ambiguity in
 /// non-homogenous array definitions
-pub fn entry_counts_from_group<'a>(cddl: &'a CDDL, group: Group<'a>) -> Vec<EntryCount<'a>> {
+pub fn entry_counts_from_group<'a>(cddl: &'a CDDL, group: Group<'a>) -> Vec<EntryCount> {
   // Each EntryCount is associated with a group choice in the given group
   let mut entry_counts = Vec::new();
 
@@ -1044,11 +1044,11 @@ pub fn validate_entry_count(valid_entry_counts: &[EntryCount], num_entries: usiz
 
 /// Entry count
 #[derive(Clone, Debug)]
-pub struct EntryCount<'a> {
+pub struct EntryCount {
   /// Count
   pub count: u64,
   /// Optional occurrence
-  pub entry_occurrence: Option<Occur<'a>>,
+  pub entry_occurrence: Option<Occur>,
 }
 
 /// Regex needs to be formatted in a certain way so it can be parsed. See