more changes

Author: molpopgen

src/mutation_table.rs

@@ -44,7 +44,7 @@ fn make_mutation_table_row(table: &MutationTable, pos: tsk_id_t) -> Option<Mutat
                 parent: table.parent(pos)?,
                 time: table.time(pos)?,
                 derived_state,
-                metadata: table.raw_metadata(pos).map(|m| m.to_vec()),
+                metadata: table.table_.raw_metadata(pos).map(|m| m.to_vec()),
             })
         }
         _ => None,
@@ -152,7 +152,7 @@ impl streaming_iterator::StreamingIterator for MutationTableRowView<'_> {
         self.parent = self.table.parent(self.id).unwrap_or(MutationId::NULL);
         self.time = self.table.time(self.id).unwrap_or_else(|| f64::NAN.into());
         self.derived_state = self.table.derived_state(self.id);
-        self.metadata = self.table.raw_metadata(self.id);
+        self.metadata = self.table.table_.raw_metadata(self.id);
     }
 }
 
@@ -313,7 +313,7 @@ impl MutationTable {
         &self,
         row: impl Into<MutationId>,
     ) -> Option<Result<T, TskitError>> {
-        let buffer = self.raw_metadata(row)?;
+        let buffer = self.table_.raw_metadata(row)?;
         Some(decode_metadata_row!(T, buffer).map_err(|e| e.into()))
     }
 
@@ -361,7 +361,7 @@ impl MutationTable {
             parent: self.parent(r)?,
             time: self.time(r)?,
             derived_state: self.derived_state(r),
-            metadata: self.raw_metadata(r.into()),
+            metadata: self.table_.raw_metadata(r.into()),
         };
         Some(view)
     }