Skip to content

Commit 00acadb

Browse files
committed
fmt
1 parent 8a3692a commit 00acadb

File tree

5 files changed

+33
-14
lines changed

5 files changed

+33
-14
lines changed

src/edge_table.rs

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,14 @@ impl<'a> EdgeTable<'a> {
8989
/// * `Some(parent)` if `u` is valid.
9090
/// * `None` otherwise.
9191
pub fn parent<E: Into<EdgeId> + Copy>(&'a self, row: E) -> Option<NodeId> {
92-
unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_, parent, NodeId)
92+
unsafe_tsk_column_access!(
93+
row.into().0,
94+
0,
95+
self.num_rows(),
96+
self.table_,
97+
parent,
98+
NodeId
99+
)
93100
}
94101

95102
/// Return the ``child`` value from row ``row`` of the table.
@@ -109,7 +116,14 @@ impl<'a> EdgeTable<'a> {
109116
/// * `Some(position)` if `u` is valid.
110117
/// * `None` otherwise.
111118
pub fn left<E: Into<EdgeId> + Copy>(&'a self, row: E) -> Option<Position> {
112-
unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_, left, Position)
119+
unsafe_tsk_column_access!(
120+
row.into().0,
121+
0,
122+
self.num_rows(),
123+
self.table_,
124+
left,
125+
Position
126+
)
113127
}
114128

115129
/// Return the ``right`` value from row ``row`` of the table.
@@ -119,7 +133,7 @@ impl<'a> EdgeTable<'a> {
119133
/// * `Some(position)` if `u` is valid.
120134
/// * `None` otherwise.
121135
pub fn right<E: Into<EdgeId> + Copy>(&'a self, row: E) -> Option<Position> {
122-
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_,right)
136+
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_, right)
123137
}
124138

125139
pub fn metadata<T: metadata::MetadataRoundtrip>(

src/individual_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<'a> IndividualTable<'a> {
107107
/// * `Some(flags)` if `row` is valid.
108108
/// * `None` otherwise.
109109
pub fn flags<I: Into<IndividualId> + Copy>(&self, row: I) -> Option<IndividualFlags> {
110-
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_,flags)
110+
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_, flags)
111111
}
112112

113113
/// Return the locations for a given row.

src/migration_table.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl<'a> MigrationTable<'a> {
9898
/// * `Some(position)` if `row` is valid.
9999
/// * `None` otherwise.
100100
pub fn left<M: Into<MigrationId> + Copy>(&'a self, row: M) -> Option<Position> {
101-
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_,left)
101+
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_, left)
102102
}
103103

104104
/// Return the right coordinate for a given row.
@@ -108,7 +108,7 @@ impl<'a> MigrationTable<'a> {
108108
/// * `Some(positions)` if `row` is valid.
109109
/// * `None` otherwise.
110110
pub fn right<M: Into<MigrationId> + Copy>(&'a self, row: M) -> Option<Position> {
111-
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_,right)
111+
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_, right)
112112
}
113113

114114
/// Return the node for a given row.
@@ -132,7 +132,8 @@ impl<'a> MigrationTable<'a> {
132132
row.into().0,
133133
0,
134134
self.num_rows(),
135-
self.table_,source,
135+
self.table_,
136+
source,
136137
PopulationId
137138
)
138139
}
@@ -148,7 +149,8 @@ impl<'a> MigrationTable<'a> {
148149
row.into().0,
149150
0,
150151
self.num_rows(),
151-
self.table_,dest,
152+
self.table_,
153+
dest,
152154
PopulationId
153155
)
154156
}
@@ -160,7 +162,7 @@ impl<'a> MigrationTable<'a> {
160162
/// * `Some(time)` if `row` is valid.
161163
/// * `None` otherwise.
162164
pub fn time<M: Into<MigrationId> + Copy>(&'a self, row: M) -> Option<Time> {
163-
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_,time)
165+
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_, time)
164166
}
165167

166168
/// Return the metadata for a given row.

src/node_table.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl<'a> NodeTable<'a> {
105105
/// # }
106106
/// ```
107107
pub fn time<N: Into<NodeId> + Copy>(&'a self, row: N) -> Option<Time> {
108-
unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_,time, Time)
108+
unsafe_tsk_column_access!(row.into().0, 0, self.num_rows(), self.table_, time, Time)
109109
}
110110

111111
/// Return the ``flags`` value from row ``row`` of the table.
@@ -130,7 +130,7 @@ impl<'a> NodeTable<'a> {
130130
/// # }
131131
/// ```
132132
pub fn flags<N: Into<NodeId> + Copy>(&'a self, row: N) -> Option<NodeFlags> {
133-
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_,flags)
133+
unsafe_tsk_column_access_and_map_into!(row.into().0, 0, self.num_rows(), self.table_, flags)
134134
}
135135

136136
/// Mutable access to node flags.
@@ -275,7 +275,8 @@ impl<'a> NodeTable<'a> {
275275
row.into().0,
276276
0,
277277
self.num_rows(),
278-
self.table_,population,
278+
self.table_,
279+
population,
279280
PopulationId
280281
)
281282
}
@@ -320,7 +321,8 @@ impl<'a> NodeTable<'a> {
320321
row.into().0,
321322
0,
322323
self.num_rows(),
323-
self.table_,individual,
324+
self.table_,
325+
individual,
324326
IndividualId
325327
)
326328
}

src/site_table.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ impl<'a> SiteTable<'a> {
8989
row.into().0,
9090
0,
9191
self.num_rows(),
92-
self.table_,position,
92+
self.table_,
93+
position,
9394
Position
9495
)
9596
}

0 commit comments

Comments
 (0)