Merge branch 'main' into mkirk/prepared-geom

georust · Jul 26, 2024 · 7af23c7 · 7af23c7
2 parents 9e895d4 + 5dc1c4b
commit 7af23c7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
       matrix:
         container_image:
           # Use the latest stable version. No need for older versions.
-          - "georust/geo-ci:proj-9.3.1-rust-1.75"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -77,10 +77,10 @@ jobs:
           # giving us about 6 months of coverage.
           #
           # Minimum supported rust version (MSRV)
-          - "georust/geo-ci:proj-9.3.1-rust-1.70"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.74"
           # Two most recent releases - we omit older ones for expedient CI
-          - "georust/geo-ci:proj-9.3.1-rust-1.74"
-          - "georust/geo-ci:proj-9.3.1-rust-1.75"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -105,10 +105,10 @@ jobs:
           # giving us about 6 months of coverage.
           #
           # Minimum supported rust version (MSRV)
-          - "georust/geo-ci:proj-9.3.1-rust-1.70"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.74"
           # Two most recent releases - we omit older ones for expedient CI
-          - "georust/geo-ci:proj-9.3.1-rust-1.74"
-          - "georust/geo-ci:proj-9.3.1-rust-1.75"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -132,10 +132,10 @@ jobs:
           # giving us about 6 months of coverage.
           #
           # Minimum supported rust version (MSRV)
-          - "georust/geo-ci:proj-9.3.1-rust-1.70"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.74"
           # Two most recent releases - we omit older ones for expedient CI
-          - "georust/geo-ci:proj-9.3.1-rust-1.74"
-          - "georust/geo-ci:proj-9.3.1-rust-1.75"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.78"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -155,7 +155,7 @@ jobs:
       matrix:
         container_image:
           # Fuzz only on latest
-          - "georust/geo-ci:proj-9.3.1-rust-1.75"
+          - "ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79"
     container:
       image: ${{ matrix.container_image }}
     steps:
@@ -168,7 +168,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     container:
-      image: georust/geo-ci:proj-9.3.1-rust-1.75
+      image: ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -179,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     container:
-      image: georust/geo-ci:proj-9.3.1-rust-1.75
+      image: ghcr.io/georust/geo-ci:proj-9.4.0-rust-1.79
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/geo-postgis/Cargo.toml b/geo-postgis/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "https://docs.rs/geo-postgis/"
 readme = "../README.md"
 keywords = ["gis", "geo", "geography", "geospatial", "postgis"]
 description = "Conversion between `geo-types` and `postgis` types."
-rust-version = "1.70"
+rust-version = "1.74"
 edition = "2021"
 
 [dependencies]

diff --git a/geo-types/Cargo.toml b/geo-types/Cargo.toml
@@ -7,7 +7,7 @@ documentation = "https://docs.rs/geo-types/"
 readme = "../README.md"
 keywords = ["gis", "geo", "geography", "geospatial"]
 description = "Geospatial primitive data types"
-rust-version = "1.70"
+rust-version = "1.74"
 edition = "2021"
 
 [features]

diff --git a/geo/CHANGES.md b/geo/CHANGES.md
@@ -14,6 +14,8 @@
   * <https://github.com/georust/geo/pull/1197>
 * Implement Frechet distance using linear algorithm to avoid `fatal runtime error: stack overflow` and improve overall performances.
   * <https://github.com/georust/geo/pull/1199>
+* Bump `geo` MSRV to 1.74 and update CI
+  * <https://github.com/georust/geo/pull/1201>
 
 ## 0.28.0
 

diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -9,7 +9,7 @@ readme = "../README.md"
 keywords = ["gis", "geo", "geography", "geospatial"]
 autobenches = true
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.74"
 categories = ["science::geo"]
 
 [features]

diff --git a/geo/src/algorithm/sweep/active.rs b/geo/src/algorithm/sweep/active.rs
@@ -59,6 +59,7 @@ impl<T: PartialOrd + Debug> PartialOrd for Active<T> {
 }
 
 /// Trait abstracting a container of active segments.
+#[allow(dead_code)]
 pub(in crate::algorithm) trait ActiveSet: Default {
     type Seg;
     fn previous_find<F: FnMut(&Active<Self::Seg>) -> bool>(