Merge #895

895: update CI r=lnicola a=michaelkirk - [x] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/main/CODE_OF_CONDUCT.md). - [x] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users. --- Co-authored-by: Michael Kirk <[email protected]>
georust · Aug 17, 2022 · 0df7ec4 · 0df7ec4
2 parents a1960cc + 4a06d90
commit 0df7ec4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,7 +43,7 @@ jobs:
       matrix:
         container_image:
           # Use the latest stable version. No need for older versions.
-          - "georust/geo-ci:proj-9.0.0-rust-1.59"
+          - "georust/geo-ci:rust-1.63"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -69,7 +69,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "georust/geo-ci:proj-9.0.0-rust-1.58"
           # Two most recent releases - we omit older ones for expedient CI
-          - "georust/geo-ci:proj-9.0.0-rust-1.59"
+          - "georust/geo-ci:rust-1.62"
+          - "georust/geo-ci:rust-1.63"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -94,7 +95,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "georust/geo-ci:proj-9.0.0-rust-1.58"
           # Two most recent releases - we omit older ones for expedient CI
-          - "georust/geo-ci:proj-9.0.0-rust-1.59"
+          - "georust/geo-ci:rust-1.62"
+          - "georust/geo-ci:rust-1.63"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -120,7 +122,8 @@ jobs:
           # Minimum supported rust version (MSRV)
           - "georust/geo-ci:proj-9.0.0-rust-1.58"
           # Two most recent releases - we omit older ones for expedient CI
-          - "georust/geo-ci:proj-9.0.0-rust-1.59"
+          - "georust/geo-ci:rust-1.62"
+          - "georust/geo-ci:rust-1.63"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -140,7 +143,7 @@ jobs:
       matrix:
         container_image:
           # Fuzz only on latest
-          - "georust/geo-ci:proj-9.0.0-rust-1.59"
+          - "georust/geo-ci:rust-1.63"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -153,7 +156,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     container:
-      image: georust/geo-ci:proj-9.0.0-rust-1.59
+      image: georust/geo-ci:rust-1.63
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

diff --git a/geo/examples/concavehull-usage.rs b/geo/examples/concavehull-usage.rs
@@ -10,10 +10,10 @@ fn generate_polygon_str(coords: &[Coordinate]) -> String {
     for coord in coords {
         points_str.push_str(format!("{},{} ", coord.x, coord.y).as_ref());
     }
-    return format!(
+    format!(
         "    <polygon points=\"{}\" fill=\"none\" stroke=\"black\"/>\n",
         points_str
-    );
+    )
 }
 
 fn generate_consecutive_circles(coords: &[Coordinate]) -> String {

diff --git a/geo/src/algorithm/coordinate_position.rs b/geo/src/algorithm/coordinate_position.rs
@@ -3,7 +3,7 @@ use crate::{coord, GeoNum, GeometryCow};
 use crate::{BoundingRect, HasDimensions, Intersects};
 
 /// The position of a `Coordinate` relative to a `Geometry`
-#[derive(PartialEq, Clone, Copy, Debug)]
+#[derive(PartialEq, Eq, Clone, Copy, Debug)]
 pub enum CoordPos {
     OnBoundary,
     Inside,

diff --git a/geo/src/algorithm/extremes.rs b/geo/src/algorithm/extremes.rs
@@ -28,13 +28,13 @@ pub trait Extremes<'a, T: CoordNum> {
     fn extremes(&'a self) -> Option<Outcome<T>>;
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Extreme<T: CoordNum> {
     pub index: usize,
     pub coord: Coordinate<T>,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Outcome<T: CoordNum> {
     pub x_min: Extreme<T>,
     pub y_min: Extreme<T>,

diff --git a/geo/src/algorithm/relate/geomgraph/quadrant.rs b/geo/src/algorithm/relate/geomgraph/quadrant.rs
@@ -9,7 +9,7 @@ use crate::GeoNum;
 ///        SW ┃ SE
 ///          (-)
 /// ```
-#[derive(Debug, Clone, Copy, PartialOrd, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialOrd, PartialEq, Eq)]
 pub enum Quadrant {
     NE,
     NW,

diff --git a/geo/src/algorithm/simplify.rs b/geo/src/algorithm/simplify.rs
@@ -87,9 +87,9 @@ where
     if farthest_distance > *epsilon {
         // The farthest index was larger than epsilon, so we will recursively simplify subsegments
         // split by the farthest index.
-        let mut intermediate = compute_rdp(&rdp_indices[..=farthest_index], &*epsilon);
+        let mut intermediate = compute_rdp(&rdp_indices[..=farthest_index], epsilon);
         intermediate.pop(); // Don't include the farthest index twice
-        intermediate.extend_from_slice(&compute_rdp(&rdp_indices[farthest_index..], &*epsilon));
+        intermediate.extend_from_slice(&compute_rdp(&rdp_indices[farthest_index..], epsilon));
         intermediate
     } else {
         // The farthest index was less than or equal to epsilon, so we will retain only the first