Bump edition

Author: b4l

Cargo.toml

@@ -16,7 +16,7 @@ default-members = ["ogcapi"]
 [workspace.package]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/georust/ogcapi"
-edition = "2021"
+edition = "2024"
 categories = ["science::geospatial"]
 keywords = ["geography", "geo", "geospatial", "gis", "api"]
 

examples/data-loader/Cargo.toml

@@ -24,7 +24,7 @@ geojson = { workspace = true, optional = true, features = ["geo-types"] }
 osmpbfreader = { version = "0.17.0", optional = true }
 serde_json = { workspace = true }
 sqlx = { version = "0.8.3", features = ["runtime-tokio-rustls", "postgres"] }
-tokio = { version = "1.43.0", features = ["full"] }
+tokio = { version = "1.43", features = ["full"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 url = { workspace = true, features = ["serde"] }

examples/data-loader/src/geojson.rs

@@ -1,12 +1,12 @@
 use std::{convert::TryInto, io::Cursor, time::Instant};
 
 use geo::Geometry;
-use geojson::{feature::Id, FeatureCollection};
+use geojson::{FeatureCollection, feature::Id};
 use sqlx::types::Json;
 use wkb::Endianness;
 
 use ogcapi::{
-    drivers::{postgres::Db, CollectionTransactions},
+    drivers::{CollectionTransactions, postgres::Db},
     types::common::{Collection, Crs, Extent, SpatialExtent},
 };
 
@@ -30,10 +30,11 @@ pub async fn load(args: Args) -> anyhow::Result<()> {
             .bbox
             .map(|bbox| Extent {
                 spatial: Some(SpatialExtent {
-                    bbox: vec![bbox
-                        .as_slice()
-                        .try_into()
-                        .unwrap_or_else(|_| [-180.0, -90.0, 180.0, 90.0].into())],
+                    bbox: vec![
+                        bbox.as_slice()
+                            .try_into()
+                            .unwrap_or_else(|_| [-180.0, -90.0, 180.0, 90.0].into()),
+                    ],
                     crs: Crs::default(),
                 }),
                 ..Default::default()

examples/data-loader/src/main.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use tracing_subscriber::{prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, prelude::*};
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
@@ -35,7 +35,9 @@ async fn main() -> anyhow::Result<()> {
                 data_loader::ogr::load(args).await?
             }
             x => {
-                tracing::warn!("No loader found for extension `{x:?}`! May need to activate additional features.");
+                tracing::warn!(
+                    "No loader found for extension `{x:?}`! May need to activate additional features."
+                );
             }
         }
     }

examples/data-loader/src/ogr.rs

@@ -8,11 +8,11 @@ use arrow::{
     json::ArrayWriter,
 };
 use gdal::{
-    cpl::CslStringList, spatial_ref::SpatialRef, vector::LayerAccess, ArrowArrayStream, Dataset,
+    ArrowArrayStream, Dataset, cpl::CslStringList, spatial_ref::SpatialRef, vector::LayerAccess,
 };
 
 use ogcapi::{
-    drivers::{postgres::Db, CollectionTransactions},
+    drivers::{CollectionTransactions, postgres::Db},
     types::common::{Bbox, Collection, Crs, Extent, SpatialExtent},
 };
 

examples/data-loader/src/osm.rs

@@ -6,7 +6,7 @@ use serde_json::{Map, Value};
 use wkb::Endianness;
 
 use ogcapi::{
-    drivers::{postgres::Db, CollectionTransactions},
+    drivers::{CollectionTransactions, postgres::Db},
     types::common::{Collection, Crs},
 };
 

examples/demo-service/Cargo.toml

@@ -10,7 +10,7 @@ stac = []
 [dependencies]
 clap = { version = "4.5", features = ["derive", "env"] }
 dotenvy = "0.15.7"
-tokio = { version = "1.42", features = ["full"] }
+tokio = { version = "1.43", features = ["full"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 

ogcapi-client/src/client.rs

@@ -1,27 +1,27 @@
 use std::cell::OnceCell;
 
 use reqwest::{
+    Url,
     blocking::Client as ReqwestClient,
     header::{HeaderMap, HeaderValue, USER_AGENT},
-    Url,
 };
 
 #[cfg(not(feature = "stac"))]
 use ogcapi_types::features::Feature;
-#[cfg(feature = "stac")]
 use ogcapi_types::{
     common::{
-        link_rel::{CHILD, ITEM, SELF},
-        Link,
+        Collection, Conformance, LandingPage, Links,
+        link_rel::{CONFORMANCE, DATA, NEXT},
     },
-    stac::{Catalog, Item as Feature, SearchParams, StacEntity},
+    features::FeatureCollection,
 };
+#[cfg(feature = "stac")]
 use ogcapi_types::{
     common::{
-        link_rel::{CONFORMANCE, DATA, NEXT},
-        Collection, Conformance, LandingPage, Links,
+        Link,
+        link_rel::{CHILD, ITEM, SELF},
     },
-    features::FeatureCollection,
+    stac::{Catalog, Item as Feature, SearchParams, StacEntity},
 };
 
 use crate::Error;

ogcapi-drivers/src/postgres/edr.rs

@@ -61,9 +61,9 @@ impl EdrQuerier for Db {
                     )
                 } else {
                     format!(
-                    "ST_DWithin(ST_Transform(geom, 4326)::geography, ST_Transform(ST_GeomFromEWKT('SRID={};{}'), 4326)::geography, {}, false)",
-                    srid, query.coords, distance
-                )
+                        "ST_DWithin(ST_Transform(geom, 4326)::geography, ST_Transform(ST_GeomFromEWKT('SRID={};{}'), 4326)::geography, {}, false)",
+                        srid, query.coords, distance
+                    )
                 }
             }
             QueryType::Cube => {

ogcapi-drivers/src/postgres/mod.rs

@@ -14,9 +14,9 @@ mod style;
 mod tile;
 
 use sqlx::{
+    Postgres,
     migrate::MigrateDatabase,
     postgres::{PgConnectOptions, PgPool, PgPoolOptions},
-    Postgres,
 };
 use url::Url;