feat(server): remove async trait

Author: gadomski

server/CHANGELOG.md

@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `memory-item-search` feature ([#322](https://github.com/stac-utils/stac-rs/pull/322))
 - `APPLICATION_GEO_JSON` and `APPLICATION_OPENAPI_3_0` constants (they're now in `stac::mime`) ([#327](https://github.com/stac-utils/stac-rs/pull/327))
+- `async_trait` ([#347](https://github.com/stac-utils/stac-rs/pull/347))
 
 ## [0.1.1] - 2024-08-12
 

server/Cargo.toml

@@ -9,13 +9,13 @@ repository = "https://github.com/stac-utils/stac-rs"
 license = "MIT OR Apache-2.0"
 keywords = ["geospatial", "stac", "metadata", "geo", "raster"]
 categories = ["science", "data-structures"]
+rust-version = "1.75"
 
 [features]
 axum = ["dep:axum", "dep:bytes", "dep:mime", "dep:tower-http"]
 pgstac = ["dep:pgstac", "dep:bb8", "dep:bb8-postgres", "dep:tokio-postgres"]
 
 [dependencies]
-async-trait = "0.1"
 axum = { version = "0.7", optional = true }
 bb8 = { version = "0.8", optional = true }
 bb8-postgres = { version = "0.8", optional = true }

server/src/backend/memory.rs

@@ -1,5 +1,4 @@
 use crate::{Backend, Error, Result, DEFAULT_LIMIT};
-use async_trait::async_trait;
 use serde_json::Map;
 use stac::{Collection, Item};
 use stac_api::{ItemCollection, Items, Search};
@@ -34,7 +33,6 @@ impl MemoryBackend {
     }
 }
 
-#[async_trait]
 impl Backend for MemoryBackend {
     fn has_item_search(&self) -> bool {
         true

server/src/backend/mod.rs

@@ -3,15 +3,14 @@ mod memory;
 mod pgstac;
 
 use crate::Result;
-use async_trait::async_trait;
 pub use memory::MemoryBackend;
 #[cfg(feature = "pgstac")]
 pub use pgstac::PgstacBackend;
 use stac::{Collection, Item};
 use stac_api::{ItemCollection, Items, Search};
+use std::future::Future;
 
 /// Storage backend for a STAC API.
-#[async_trait]
 pub trait Backend: Clone + Sync + Send + 'static {
     /// Returns true if this backend has item search capabilities.
     ///
@@ -36,7 +35,7 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// assert!(collections.is_empty());
     /// # })
     /// ```
-    async fn collections(&self) -> Result<Vec<Collection>>;
+    fn collections(&self) -> impl Future<Output = Result<Vec<Collection>>> + Send;
 
     /// Returns a single collection.
     ///
@@ -50,7 +49,7 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// assert!(collection.is_none());
     /// # })
     /// ```
-    async fn collection(&self, id: &str) -> Result<Option<Collection>>;
+    fn collection(&self, id: &str) -> impl Future<Output = Result<Option<Collection>>> + Send;
 
     /// Adds a collection.
     ///
@@ -65,7 +64,8 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// backend.add_collection(Collection::new("an-id", "a description")).await.unwrap();
     /// # })
     /// ```
-    async fn add_collection(&mut self, collection: Collection) -> Result<()>;
+    fn add_collection(&mut self, collection: Collection)
+        -> impl Future<Output = Result<()>> + Send;
 
     /// Adds an item.
     ///
@@ -86,7 +86,7 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// backend.add_item(Item::new("item-id").collection("collection-id")).await.unwrap();
     /// # })
     /// ```
-    async fn add_item(&mut self, item: Item) -> Result<()>;
+    fn add_item(&mut self, item: Item) -> impl Future<Output = Result<()>> + Send;
 
     /// Retrieves items for a given collection.
     ///
@@ -104,7 +104,11 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// let items = backend.items("collection-id", Items::default()).await.unwrap();
     /// # })
     /// ```
-    async fn items(&self, collection_id: &str, items: Items) -> Result<Option<ItemCollection>>;
+    fn items(
+        &self,
+        collection_id: &str,
+        items: Items,
+    ) -> impl Future<Output = Result<Option<ItemCollection>>> + Send;
 
     /// Retrieves an item from a collection.
     ///
@@ -121,7 +125,11 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// let item = backend.item("collection-id", "item-id").await.unwrap().unwrap();
     /// # })
     /// ```
-    async fn item(&self, collection_id: &str, item_id: &str) -> Result<Option<Item>>;
+    fn item(
+        &self,
+        collection_id: &str,
+        item_id: &str,
+    ) -> impl Future<Output = Result<Option<Item>>> + Send;
 
     /// Searches a backend.
     ///
@@ -136,5 +144,5 @@ pub trait Backend: Clone + Sync + Send + 'static {
     /// let item_collection = backend.search(Search::default()).await.unwrap();
     /// # })
     /// ```
-    async fn search(&self, search: Search) -> Result<ItemCollection>;
+    fn search(&self, search: Search) -> impl Future<Output = Result<ItemCollection>> + Send;
 }

server/src/backend/pgstac.rs

@@ -1,5 +1,4 @@
 use crate::{Backend, Error, Result};
-use async_trait::async_trait;
 use bb8::Pool;
 use bb8_postgres::PostgresConnectionManager;
 use pgstac::Client;
@@ -36,7 +35,6 @@ impl PgstacBackend {
     }
 }
 
-#[async_trait]
 impl Backend for PgstacBackend {
     fn has_item_search(&self) -> bool {
         true