chore: Remove unnecessary unwraps (#79)

* Remove a few unneeded unwraps

* Add OverflowError

* Update changelog

Author: kylebarron

CHANGELOG.md

@@ -3,7 +3,8 @@
 ## Unreleased
 
 - Don't panic when parsing invalid WKB (#74).
-- Fix CI by removing georust container & fix clippy lint (#140)
+- Fix CI by removing georust container & fix clippy lint (#78)
+- Remove unnecessary `unwrap`s #79
 
 ## 0.9.0 - 2025-05-14
 

src/error.rs

@@ -23,6 +23,10 @@ pub enum WkbError {
     /// [std::io::Error]
     #[error(transparent)]
     IOError(#[from] std::io::Error),
+
+    /// Overflow when casting to a u32 to write to WKB buffer
+    #[error(transparent)]
+    OverflowError(#[from] std::num::TryFromIntError),
 }
 
 /// Crate-specific result type.

src/reader/linearring.rs

@@ -122,7 +122,7 @@ impl<'a> LineStringTrait for LinearRing<'a> {
         Coord::new(
             self.buf,
             self.byte_order,
-            self.coord_offset(i.try_into().unwrap()),
+            self.coord_offset(i as u64),
             self.dim,
         )
     }
@@ -144,7 +144,7 @@ impl<'a> LineStringTrait for &LinearRing<'a> {
         Coord::new(
             self.buf,
             self.byte_order,
-            self.coord_offset(i.try_into().unwrap()),
+            self.coord_offset(i as u64),
             self.dim,
         )
     }

src/reader/linestring.rs

@@ -122,7 +122,7 @@ impl<'a> LineStringTrait for LineString<'a> {
         Coord::new(
             self.buf,
             self.byte_order,
-            self.coord_offset(i.try_into().unwrap()),
+            self.coord_offset(i as u64),
             self.dim,
         )
     }
@@ -142,7 +142,7 @@ impl<'a> LineStringTrait for &LineString<'a> {
         Coord::new(
             self.buf,
             self.byte_order,
-            self.coord_offset(i.try_into().unwrap()),
+            self.coord_offset(i as u64),
             self.dim,
         )
     }

src/reader/multipoint.rs

@@ -116,7 +116,7 @@ impl<'a> MultiPointTrait for MultiPoint<'a> {
         Point::new(
             self.buf,
             self.byte_order,
-            self.point_offset(i.try_into().unwrap()),
+            self.point_offset(i as u64),
             self.dim,
         )
     }
@@ -136,7 +136,7 @@ impl<'a> MultiPointTrait for &MultiPoint<'a> {
         Point::new(
             self.buf,
             self.byte_order,
-            self.point_offset(i.try_into().unwrap()),
+            self.point_offset(i as u64),
             self.dim,
         )
     }

src/writer/geometrycollection.rs

@@ -47,36 +47,11 @@ fn write_geometry_collection_content<B: ByteOrder>(
     writer.write_u32::<B>(wkb_type.into())?;
 
     // numGeometries
-    writer.write_u32::<B>(geom.num_geometries().try_into().unwrap())?;
+    writer.write_u32::<B>(geom.num_geometries().try_into()?)?;
 
     for inner_geom in geom.geometries() {
         write_geometry(writer, &inner_geom, options)?;
     }
 
     Ok(())
 }
-
-// #[cfg(test)]
-// mod test {
-//     use super::*;
-//     use crate::test::multipoint;
-//     use crate::test::multipolygon;
-
-//     #[test]
-//     fn round_trip() {
-//         let gc0 = geo::GeometryCollection::new_from(vec![
-//             geo::Geometry::MultiPoint(multipoint::mp0()),
-//             geo::Geometry::MultiPolygon(multipolygon::mp0()),
-//         ]);
-//         let gc1 = geo::GeometryCollection::new_from(vec![
-//             geo::Geometry::MultiPoint(multipoint::mp1()),
-//             geo::Geometry::MultiPolygon(multipolygon::mp1()),
-//         ]);
-
-//         let orig_arr: GeometryCollectionArray<i32> = vec![Some(gc0), Some(gc1), None].into();
-//         let wkb_arr: WKBArray<i32> = (&orig_arr).into();
-//         let new_arr: GeometryCollectionArray<i32> = wkb_arr.try_into().unwrap();
-
-//         assert_eq!(orig_arr, new_arr);
-//     }
-// }

src/writer/linestring.rs

@@ -22,7 +22,7 @@ pub fn write_line_string(
     options: &WriteOptions,
 ) -> WkbResult<()> {
     // Byte order
-    writer.write_u8(options.endianness.into()).unwrap();
+    writer.write_u8(options.endianness.into())?;
 
     // Content
     match options.endianness {
@@ -39,9 +39,7 @@ fn write_line_string_content<B: ByteOrder>(
     writer.write_u32::<B>(wkb_type.into())?;
 
     // numPoints
-    writer
-        .write_u32::<B>(geom.num_coords().try_into().unwrap())
-        .unwrap();
+    writer.write_u32::<B>(geom.num_coords().try_into()?)?;
 
     for coord in geom.coords() {
         write_coord::<B>(writer, &coord)?;

src/writer/multilinestring.rs

@@ -46,7 +46,7 @@ fn write_multi_line_string_content<B: ByteOrder>(
     writer.write_u32::<B>(wkb_type.into())?;
 
     // numPoints
-    writer.write_u32::<B>(geom.num_line_strings().try_into().unwrap())?;
+    writer.write_u32::<B>(geom.num_line_strings().try_into()?)?;
 
     for line_string in geom.line_strings() {
         write_line_string(writer, &line_string, options)?;

src/writer/multipoint.rs

@@ -39,7 +39,7 @@ fn write_multi_point_content<B: ByteOrder>(
     writer.write_u32::<B>(wkb_type.into())?;
 
     // numPoints
-    writer.write_u32::<B>(geom.num_points().try_into().unwrap())?;
+    writer.write_u32::<B>(geom.num_points().try_into()?)?;
 
     for point in geom.points() {
         write_point(writer, &point, options)?;

src/writer/multipolygon.rs

@@ -44,26 +44,11 @@ fn write_multi_polygon_content<B: ByteOrder>(
     writer.write_u32::<B>(wkb_type.into())?;
 
     // numPolygons
-    writer.write_u32::<B>(geom.num_polygons().try_into().unwrap())?;
+    writer.write_u32::<B>(geom.num_polygons().try_into()?)?;
 
     for polygon in geom.polygons() {
         write_polygon(writer, &polygon, options)?;
     }
 
     Ok(())
 }
-
-// #[cfg(test)]
-// mod test {
-//     use super::*;
-//     use crate::test::multipolygon::{mp0, mp1};
-
-//     #[test]
-//     fn round_trip() {
-//         let orig_arr: MultiPolygonArray<2> = vec![Some(mp0()), Some(mp1()), None].into();
-//         let wkb_arr: WKBArray<i32> = (&orig_arr).into();
-//         let new_arr: MultiPolygonArray<2> = wkb_arr.try_into().unwrap();
-
-//         assert_eq!(orig_arr, new_arr);
-//     }
-// }