Skip to content

Commit cc6f5ce

Browse files
committed
examples show better pattern
1 parent 9bf99ae commit cc6f5ce

File tree

6 files changed

+36
-27
lines changed

6 files changed

+36
-27
lines changed

src/individual_table.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,12 @@ build_owned_table_type!(
308308
/// let rowid = individuals.add_row_with_metadata(0, None, None, &metadata).unwrap();
309309
/// assert_eq!(rowid, 0);
310310
///
311-
/// if let Some(Ok(decoded)) = individuals.metadata::<IndividualMetadata>(rowid) {
312-
/// assert_eq!(decoded.value, 42);
313-
/// } else {
314-
/// panic!("hmm...we expected some metadata!");
311+
/// match individuals.metadata::<IndividualMetadata>(rowid) {
312+
/// // rowid is in range, decoding succeeded
313+
/// Some(Ok(decoded)) => assert_eq!(decoded.value, 42),
314+
/// // rowid is in range, decoding failed
315+
/// Some(Err(e)) => panic!("error decoding metadata: {:?}", e),
316+
/// None => panic!("row id out of range")
315317
/// }
316318
///
317319
/// # }

src/migration_table.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,12 @@ build_owned_table_type!(
242242
/// let rowid = migrations.add_row_with_metadata((0., 1.), 1, (0, 1), 10.3, &metadata).unwrap();
243243
/// assert_eq!(rowid, 0);
244244
///
245-
/// if let Some(Ok(decoded)) = migrations.metadata::<MigrationMetadata>(rowid) {
246-
/// assert_eq!(decoded.value, 42);
247-
/// } else {
248-
/// panic!("hmm...we expected some metadata!");
245+
/// match migrations.metadata::<MigrationMetadata>(rowid) {
246+
/// // rowid is in range, decoding succeeded
247+
/// Some(Ok(decoded)) => assert_eq!(decoded.value, 42),
248+
/// // rowid is in range, decoding failed
249+
/// Some(Err(e)) => panic!("error decoding metadata: {:?}", e),
250+
/// None => panic!("row id out of range")
249251
/// }
250252
///
251253
/// # }

src/mutation_table.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,13 @@ build_owned_table_type!(
231231
/// let rowid = mutations.add_row_with_metadata(0, 1, 5, 10.0, None, &metadata).unwrap();
232232
/// assert_eq!(rowid, 0);
233233
///
234-
/// if let Some(Ok(decoded)) = mutations.metadata::<MutationMetadata>(rowid) {
235-
/// assert_eq!(decoded.value, 42);
236-
/// } else {
237-
/// panic!("hmm...we expected some metadata!");
234+
/// match mutations.metadata::<MutationMetadata>(rowid) {
235+
/// // rowid is in range, decoding succeeded
236+
/// Some(Ok(decoded)) => assert_eq!(decoded.value, 42),
237+
/// // rowid is in range, decoding failed
238+
/// Some(Err(e)) => panic!("error decoding metadata: {:?}", e),
239+
/// None => panic!("row id out of range")
238240
/// }
239-
///
240241
/// # }
241242
/// ```
242243
=> OwnedMutationTable,

src/node_table.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,12 @@ build_owned_table_type!(
285285
/// let rowid = nodes.add_row_with_metadata(0, 1., -1, -1, &metadata).unwrap();
286286
/// assert_eq!(rowid, 0);
287287
///
288-
/// if let Some(Ok(decoded)) = nodes.metadata::<NodeMetadata>(rowid) {
289-
/// assert_eq!(decoded.value, 42);
290-
/// } else {
291-
/// panic!("hmm...we expected some metadata!");
288+
/// match nodes.metadata::<NodeMetadata>(rowid) {
289+
/// // rowid is in range, decoding succeeded
290+
/// Some(Ok(decoded)) => assert_eq!(decoded.value, 42),
291+
/// // rowid is in range, decoding failed
292+
/// Some(Err(e)) => panic!("error decoding metadata: {:?}", e),
293+
/// None => panic!("row id out of range")
292294
/// }
293295
///
294296
/// # }

src/population_table.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,13 @@ build_owned_table_type!(
152152
/// let rowid = populations.add_row_with_metadata(&metadata).unwrap();
153153
/// assert_eq!(rowid, 0);
154154
///
155-
/// if let Some(Ok(decoded)) = populations.metadata::<PopulationMetadata>(rowid) {
156-
/// assert_eq!(&decoded.name, "YRB");
157-
/// } else {
158-
/// panic!("hmm...we expected some metadata!");
155+
/// match populations.metadata::<PopulationMetadata>(rowid) {
156+
/// // rowid is in range, decoding succeeded
157+
/// Some(Ok(decoded)) => assert_eq!(&decoded.name, "YRB"),
158+
/// // rowid is in range, decoding failed
159+
/// Some(Err(e)) => panic!("error decoding metadata: {:?}", e),
160+
/// None => panic!("row id out of range")
159161
/// }
160-
///
161162
/// # }
162163
/// ```
163164
=> OwnedPopulationTable,

src/site_table.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,13 @@ build_owned_table_type!(
180180
/// let rowid = sites.add_row_with_metadata(0., None, &metadata).unwrap();
181181
/// assert_eq!(rowid, 0);
182182
///
183-
/// if let Some(Ok(decoded)) = sites.metadata::<SiteMetadata>(rowid) {
184-
/// assert_eq!(decoded.value, 42);
185-
/// } else {
186-
/// panic!("hmm...we expected some metadata!");
183+
/// match sites.metadata::<SiteMetadata>(rowid) {
184+
/// // rowid is in range, decoding succeeded
185+
/// Some(Ok(decoded)) => assert_eq!(decoded.value, 42),
186+
/// // rowid is in range, decoding failed
187+
/// Some(Err(e)) => panic!("error decoding metadata: {:?}", e),
188+
/// None => panic!("row id out of range")
187189
/// }
188-
///
189190
/// # }
190191
/// ```
191192
=> OwnedSiteTable,

0 commit comments

Comments
 (0)