several fixes: tests pass

Author: molpopgen

tests/experimental.rs

@@ -43,7 +43,7 @@ mod experimental_features {
     }
 
     trait IndividualMetadataRetrieval: MetadataRetrieval<tskit::IndividualId> {
-        fn mutation_metadata(
+        fn individual_metadata(
             &self,
             row: impl Into<tskit::IndividualId>,
         ) -> Result<
@@ -61,7 +61,7 @@ mod experimental_features {
         <Self as MetadataRetrieval<tskit::IndividualId>>::Metadata:
             tskit::metadata::IndividualMetadata,
     {
-        fn mutation_metadata(
+        fn individual_metadata(
             &self,
             row: impl Into<tskit::IndividualId>,
         ) -> Result<
@@ -90,7 +90,7 @@ mod experimental_features {
         effect_size: f64,
     }
 
-    #[derive(serde::Serialize, serde::Deserialize, tskit::metadata::MutationMetadata)]
+    #[derive(serde::Serialize, serde::Deserialize, tskit::metadata::IndividualMetadata)]
     #[serializer("serde_json")]
     struct IndividualMetadataType {
         fitness: f64,
@@ -134,7 +134,7 @@ mod experimental_features {
 
     impl MetadataRetrieval<tskit::MutationId> for MyTableCollection {
         type Metadata = MutationMetadataType;
-        fn retrieve(
+        fn metadata(
             &self,
             row: impl Into<tskit::MutationId>,
         ) -> Result<Option<MutationMetadataType>, tskit::TskitError> {
@@ -145,10 +145,10 @@ mod experimental_features {
 
     impl MetadataRetrieval<tskit::IndividualId> for MyTableCollection {
         type Metadata = IndividualMetadataType;
-        fn retrieve(
+        fn metadata(
             &self,
-            row: impl Into<tskit::MutationId>,
-        ) -> Result<Option<MutationMetadataType>, tskit::TskitError> {
+            row: impl Into<tskit::IndividualId>,
+        ) -> Result<Option<IndividualMetadataType>, tskit::TskitError> {
             self.individuals()
                 .metadata::<IndividualMetadataType>(row.into())
         }
@@ -165,12 +165,14 @@ mod experimental_features {
         assert_eq!(decoded.effect_size, 0.10);
 
         // More ergonomic here...
-        let decoded = tables.retrieve(0).unwrap().unwrap();
-        assert_eq!(decoded.effect_size, 0.10);
+        // NOTE: this can no longer compile b/c we've
+        // got the pattern in place for > 1 trait.
+        // let decoded = tables.metadata(0).unwrap().unwrap();
+        // assert_eq!(decoded.effect_size, 0.10);
 
         // ...but not here, which is how it would normally be called...
         let decoded =
-            <MyTableCollection as MetadataRetrieval<tskit::MutationId>>::retrieve(&tables, 0)
+            <MyTableCollection as MetadataRetrieval<tskit::MutationId>>::metadata(&tables, 0)
                 .unwrap()
                 .unwrap();
         assert_eq!(decoded.effect_size, 0.10);