Merge pull request #140 from georust/fixes

Update minimum supported Rust version to 1.65, add `cargo.lock` and fix new clippy warnings

.github/workflows/CI.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.63.0
+          toolchain: 1.65.0
           override: true
           components: rustfmt
       - run: cargo fmt -- --check
@@ -58,7 +58,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.63.0
+          toolchain: 1.65.0
           override: true
 
       - name: Build static geos crate
@@ -76,7 +76,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - 1.63.0
+          - 1.65.0
           - nightly
         geos: ["3.6.5", "3.7.5", "3.8.3", "3.9.3", "3.10.3", "3.11.0"]
         include:

Cargo.toml

@@ -15,7 +15,7 @@ categories = ["external-ffi-bindings", "algorithms"]
 description = "Rust bindings for GEOS C API"
 readme = "README.md"
 edition = "2021"
-rust-version = "1.63"
+rust-version = "1.65"
 
 [features]
 dox = ["geo-types", "wkt", "json", "geos-sys/dox"]

src/functions.rs

@@ -101,7 +101,7 @@ pub(crate) fn create_multi_geom(
             let ptr = GEOSGeom_createCollection_r(
                 context.as_raw(),
                 output_type.into(),
-                geoms.as_mut_ptr() as *mut *mut GEOSGeometry,
+                geoms.as_mut_ptr() as *mut _,
                 nb_geoms as _,
             );
             Geometry::new_from_raw(ptr, context, "create_multi_geom")

src/geometry.rs

@@ -2485,7 +2485,7 @@ impl<'a> Geometry<'a> {
     /// ```
     pub fn polygonize<T: Borrow<Geometry<'a>>>(geometries: &[T]) -> GResult<Geometry<'a>> {
         unsafe {
-            let context = match geometries.get(0) {
+            let context = match geometries.first() {
                 Some(g) => g.borrow().clone_context(),
                 None => match ContextHandle::init_e(Some("Geometry::polygonize")) {
                     Ok(context) => Arc::new(context),
@@ -2506,7 +2506,7 @@ impl<'a> Geometry<'a> {
         geometries: &[T],
     ) -> GResult<Geometry<'a>> {
         unsafe {
-            let context = match geometries.get(0) {
+            let context = match geometries.first() {
                 Some(g) => g.borrow().clone_context(),
                 None => match ContextHandle::init_e(Some("Geometry::polygonizer_get_cut_edges")) {
                     Ok(context) => Arc::new(context),
@@ -2796,7 +2796,7 @@ impl<'a> Geometry<'a> {
             let ptr = GEOSGeom_createPolygon_r(
                 context_handle.as_raw(),
                 exterior.as_raw_mut(),
-                geoms.as_mut_ptr() as *mut *mut GEOSGeometry,
+                geoms.as_mut_ptr() as *mut _,
                 nb_interiors as _,
             );
             Geometry::new_from_raw(ptr, context_handle, "create_polygon")