From 5de57a93741ad77718e9bf99db257f2412554d13 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 16 Aug 2022 22:20:18 -0700 Subject: [PATCH 1/2] update CI --- .github/workflows/test.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b308d0ed..22f267b64 100644 --- 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 From 4a06d90497cbbb4dc31881b7d7eedba66124de2b Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 16 Aug 2022 22:29:35 -0700 Subject: [PATCH 2/2] address new clippy lints --- geo/examples/concavehull-usage.rs | 4 ++-- geo/src/algorithm/coordinate_position.rs | 2 +- geo/src/algorithm/extremes.rs | 4 ++-- geo/src/algorithm/relate/geomgraph/quadrant.rs | 2 +- geo/src/algorithm/simplify.rs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/geo/examples/concavehull-usage.rs b/geo/examples/concavehull-usage.rs index 6ce1296cd..b46a67554 100644 --- 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!( " \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 index 803cca8d6..4a561965c 100644 --- 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 index 24418651a..7b92b7dce 100644 --- 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>; } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub struct Extreme { pub index: usize, pub coord: Coordinate, } -#[derive(Debug, PartialEq)] +#[derive(Debug, PartialEq, Eq)] pub struct Outcome { pub x_min: Extreme, pub y_min: Extreme, diff --git a/geo/src/algorithm/relate/geomgraph/quadrant.rs b/geo/src/algorithm/relate/geomgraph/quadrant.rs index fcbc56cde..7f334a541 100644 --- 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 index 4f236d474..58a197d5b 100644 --- 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