@@ -262,7 +262,7 @@ impl TableCollection {
262262 ///
263263 /// See [`TableCollection::check_integrity`] for how to catch these data model
264264 /// violations.
265- => add_edge, self , ( * self . inner) . edges) ;
265+ => add_edge, self , self . inner. edges) ;
266266
267267 edge_table_add_row_with_metadata ! (
268268 /// Add a row with optional metadata to the edge table
@@ -285,7 +285,7 @@ impl TableCollection {
285285 /// assert!(tables.add_edge_with_metadata(0., 53., 1, 11, &metadata).is_ok());
286286 /// # }
287287 /// ```
288- => add_edge_with_metadata, self , ( * self . inner) . edges) ;
288+ => add_edge_with_metadata, self , self . inner. edges) ;
289289
290290 individual_table_add_row ! (
291291 /// Add a row to the individual table
@@ -324,7 +324,7 @@ impl TableCollection {
324324 /// # None => panic!("expected parents"),
325325 /// # }
326326 /// ```
327- => add_individual, self , ( * self . inner) . individuals) ;
327+ => add_individual, self , self . inner. individuals) ;
328328
329329 individual_table_add_row_with_metadata ! (
330330 /// Add a row with metadata to the individual table
@@ -350,7 +350,7 @@ impl TableCollection {
350350 /// # let decoded = tables.individuals().metadata::<IndividualMetadata>(0.into()).unwrap().unwrap();
351351 /// # assert_eq!(decoded.x, 1);
352352 /// # }
353- => add_individual_with_metadata, self , ( * self . inner) . individuals) ;
353+ => add_individual_with_metadata, self , self . inner. individuals) ;
354354
355355 migration_table_add_row ! (
356356 /// Add a row to the migration table
@@ -368,7 +368,7 @@ impl TableCollection {
368368 /// (0, 1),
369369 /// 53.5).is_ok());
370370 /// ```
371- => add_migration, self , ( * self . inner) . migrations) ;
371+ => add_migration, self , self . inner. migrations) ;
372372
373373 migration_table_add_row_with_metadata ! (
374374 /// Add a row with optional metadata to the migration table
@@ -400,11 +400,11 @@ impl TableCollection {
400400 ///
401401 /// Migration tables are not currently supported
402402 /// by tree sequence simplification.
403- => add_migration_with_metadata, self , ( * self . inner) . migrations) ;
403+ => add_migration_with_metadata, self , self . inner. migrations) ;
404404
405405 node_table_add_row ! (
406406 /// Add a row to the node table
407- => add_node, self , ( * self . inner) . nodes
407+ => add_node, self , self . inner. nodes
408408 ) ;
409409
410410 node_table_add_row_with_metadata ! (
@@ -429,11 +429,11 @@ impl TableCollection {
429429 /// assert!(tables.add_node_with_metadata(0, 0.0, -1, -1, &metadata).is_ok());
430430 /// # }
431431 /// ```
432- => add_node_with_metadata, self , ( * self . inner) . nodes) ;
432+ => add_node_with_metadata, self , self . inner. nodes) ;
433433
434434 site_table_add_row ! (
435435 /// Add a row to the site table
436- => add_site, self , ( * self . inner) . sites) ;
436+ => add_site, self , self . inner. sites) ;
437437
438438 site_table_add_row_with_metadata ! (
439439 /// Add a row with optional metadata to the site table
@@ -458,11 +458,11 @@ impl TableCollection {
458458 /// &metadata).is_ok());
459459 /// # }
460460 /// ```
461- => add_site_with_metadata, self , ( * self . inner) . sites) ;
461+ => add_site_with_metadata, self , self . inner. sites) ;
462462
463463 mutation_table_add_row ! (
464464 /// Add a row to the mutation table.
465- => add_mutation, self , ( * self . inner) . mutations) ;
465+ => add_mutation, self , self . inner. mutations) ;
466466
467467 mutation_table_add_row_with_metadata ! (
468468 /// Add a row with optional metadata to the mutation table.
@@ -486,7 +486,7 @@ impl TableCollection {
486486 /// &metadata).is_ok());
487487 /// # }
488488 /// ```
489- => add_mutation_with_metadata, self , ( * self . inner) . mutations) ;
489+ => add_mutation_with_metadata, self , self . inner. mutations) ;
490490
491491 population_table_add_row ! (
492492 /// Add a row to the population_table
@@ -497,7 +497,7 @@ impl TableCollection {
497497 /// # let mut tables = tskit::TableCollection::new(55.0).unwrap();
498498 /// tables.add_population().unwrap();
499499 /// ```
500- => add_population, self , ( * self . inner) . populations) ;
500+ => add_population, self , self . inner. populations) ;
501501
502502 population_table_add_row_with_metadata ! (
503503 /// Add a row with optional metadata to the population_table
@@ -519,7 +519,7 @@ impl TableCollection {
519519 /// let metadata = PopulationMetadata{x: 1};
520520 /// assert!(tables.add_population_with_metadata(&metadata).is_ok());
521521 /// # }
522- => add_population_with_metadata, self , ( * self . inner) . populations) ;
522+ => add_population_with_metadata, self , self . inner. populations) ;
523523
524524 /// Build the "input" and "output"
525525 /// indexes for the edge table.
@@ -898,7 +898,7 @@ impl TableCollection {
898898 /// assert_eq!(treeseq.provenances().record(0).unwrap(), row_0.record);
899899 /// # }
900900 /// ```
901- => add_provenance, self , ( * self . inner) . provenances) ;
901+ => add_provenance, self , self . inner. provenances) ;
902902
903903 /// Set the edge table from an [`OwnedEdgeTable`](`crate::OwnedEdgeTable`)
904904 ///
@@ -924,7 +924,7 @@ impl TableCollection {
924924 // to create with null pointers.
925925 let rv = unsafe {
926926 ll_bindings:: tsk_edge_table_set_columns (
927- & mut ( * self . inner ) . edges ,
927+ & mut self . inner . edges ,
928928 ( * edges. as_ptr ( ) ) . num_rows ,
929929 ( * edges. as_ptr ( ) ) . left ,
930930 ( * edges. as_ptr ( ) ) . right ,
@@ -961,7 +961,7 @@ impl TableCollection {
961961 // to create with null pointers.
962962 let rv = unsafe {
963963 ll_bindings:: tsk_node_table_set_columns (
964- & mut ( * self . inner ) . nodes ,
964+ & mut self . inner . nodes ,
965965 ( * nodes. as_ptr ( ) ) . num_rows ,
966966 ( * nodes. as_ptr ( ) ) . flags ,
967967 ( * nodes. as_ptr ( ) ) . time ,
@@ -998,7 +998,7 @@ impl TableCollection {
998998 // to create with null pointers.
999999 let rv = unsafe {
10001000 ll_bindings:: tsk_site_table_set_columns (
1001- & mut ( * self . inner ) . sites ,
1001+ & mut self . inner . sites ,
10021002 ( * sites. as_ptr ( ) ) . num_rows ,
10031003 ( * sites. as_ptr ( ) ) . position ,
10041004 ( * sites. as_ptr ( ) ) . ancestral_state ,
@@ -1034,7 +1034,7 @@ impl TableCollection {
10341034 // to create with null pointers.
10351035 let rv = unsafe {
10361036 ll_bindings:: tsk_mutation_table_set_columns (
1037- & mut ( * self . inner ) . mutations ,
1037+ & mut self . inner . mutations ,
10381038 ( * mutations. as_ptr ( ) ) . num_rows ,
10391039 ( * mutations. as_ptr ( ) ) . site ,
10401040 ( * mutations. as_ptr ( ) ) . node ,
@@ -1074,7 +1074,7 @@ impl TableCollection {
10741074 // to create with null pointers.
10751075 let rv = unsafe {
10761076 ll_bindings:: tsk_individual_table_set_columns (
1077- & mut ( * self . inner ) . individuals ,
1077+ & mut self . inner . individuals ,
10781078 ( * individuals. as_ptr ( ) ) . num_rows ,
10791079 ( * individuals. as_ptr ( ) ) . flags ,
10801080 ( * individuals. as_ptr ( ) ) . location ,
@@ -1112,7 +1112,7 @@ impl TableCollection {
11121112 // to create with null pointers.
11131113 let rv = unsafe {
11141114 ll_bindings:: tsk_migration_table_set_columns (
1115- & mut ( * self . inner ) . migrations ,
1115+ & mut self . inner . migrations ,
11161116 ( * migrations. as_ptr ( ) ) . num_rows ,
11171117 ( * migrations. as_ptr ( ) ) . left ,
11181118 ( * migrations. as_ptr ( ) ) . right ,
@@ -1150,7 +1150,7 @@ impl TableCollection {
11501150 // to create with null pointers.
11511151 let rv = unsafe {
11521152 ll_bindings:: tsk_population_table_set_columns (
1153- & mut ( * self . inner ) . populations ,
1153+ & mut self . inner . populations ,
11541154 ( * populations. as_ptr ( ) ) . num_rows ,
11551155 ( * populations. as_ptr ( ) ) . metadata ,
11561156 ( * populations. as_ptr ( ) ) . metadata_offset ,
@@ -1190,7 +1190,7 @@ impl TableCollection {
11901190 // to create with null pointers.
11911191 let rv = unsafe {
11921192 ll_bindings:: tsk_provenance_table_set_columns (
1193- & mut ( * self . inner ) . provenances ,
1193+ & mut self . inner . provenances ,
11941194 ( * provenances. as_ptr ( ) ) . num_rows ,
11951195 ( * provenances. as_ptr ( ) ) . timestamp ,
11961196 ( * provenances. as_ptr ( ) ) . timestamp_offset ,
@@ -1204,36 +1204,36 @@ impl TableCollection {
12041204
12051205impl TableAccess for TableCollection {
12061206 fn edges ( & self ) -> EdgeTable {
1207- EdgeTable :: new_from_table ( & ( * self . inner ) . edges )
1207+ EdgeTable :: new_from_table ( & self . inner . edges )
12081208 }
12091209
12101210 fn individuals ( & self ) -> IndividualTable {
1211- IndividualTable :: new_from_table ( & ( * self . inner ) . individuals )
1211+ IndividualTable :: new_from_table ( & self . inner . individuals )
12121212 }
12131213
12141214 fn migrations ( & self ) -> MigrationTable {
1215- MigrationTable :: new_from_table ( & ( * self . inner ) . migrations )
1215+ MigrationTable :: new_from_table ( & self . inner . migrations )
12161216 }
12171217
12181218 fn nodes ( & self ) -> NodeTable {
1219- NodeTable :: new_from_table ( & ( * self . inner ) . nodes )
1219+ NodeTable :: new_from_table ( & self . inner . nodes )
12201220 }
12211221
12221222 fn sites ( & self ) -> SiteTable {
1223- SiteTable :: new_from_table ( & ( * self . inner ) . sites )
1223+ SiteTable :: new_from_table ( & self . inner . sites )
12241224 }
12251225
12261226 fn mutations ( & self ) -> MutationTable {
1227- MutationTable :: new_from_table ( & ( * self . inner ) . mutations )
1227+ MutationTable :: new_from_table ( & self . inner . mutations )
12281228 }
12291229
12301230 fn populations ( & self ) -> PopulationTable {
1231- PopulationTable :: new_from_table ( & ( * self . inner ) . populations )
1231+ PopulationTable :: new_from_table ( & self . inner . populations )
12321232 }
12331233
12341234 #[ cfg( any( feature = "provenance" , doc) ) ]
12351235 fn provenances ( & self ) -> crate :: provenance:: ProvenanceTable {
1236- crate :: provenance:: ProvenanceTable :: new_from_table ( & ( * self . inner ) . provenances )
1236+ crate :: provenance:: ProvenanceTable :: new_from_table ( & self . inner . provenances )
12371237 }
12381238}
12391239
0 commit comments