fix: clippy

Author: gadomski

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
           - "-p stac-async"
           - "-p stac-cli --no-default-features"
           - "-p stac-cli --no-default-features -F geoparquet"
-          - "-p stac-duckdb -F bundled"
+          - "-p stac-duckdb -F duckdb/bundled"
           - "-p stac-server"
           - "-p stac-server -F axum"
           - "-p stac-validate"

cli/Cargo.toml

@@ -22,7 +22,7 @@ geoparquet = [
     "parquet",
 ]
 pgstac = ["stac-server/pgstac"]
-python = ["dep:pyo3", "pgstac", "duckdb", "stac-duckdb/bundled", "geoparquet"]
+python = ["dep:pyo3", "pgstac", "geoparquet"]
 
 [dependencies]
 axum = "0.7"

cli/README.md

@@ -17,6 +17,9 @@ cargo install stac-cli
 Or:
 
 ```shell
+# NOTE: The version from PyPI does not include GDAL or DuckDB support. If you
+# need to use these features, install via `cargo install` (GDAL is enabled by
+# default) or `cargo install -F duckdb` (DuckDB is not).
 pip install stacrs-cli
 ```
 
@@ -26,9 +29,6 @@ Then:
 stacrs --help
 ```
 
-**NOTE:** the version from PyPI (installed with `pip`) does not include GDAL support.
-If you need to use [gdal](../core/README.md#gdal) features, install via `cargo install`.
-
 ## Usage
 
 **stacrs** provides the following subcommands:

cli/src/args/mod.rs

@@ -194,7 +194,7 @@ impl Input {
     fn read(self, infile: Option<String>) -> Result<stac::Value> {
         let format = self
             .format
-            .or_else(|| infile.as_deref().and_then(|infile| Format::infer(infile)))
+            .or_else(|| infile.as_deref().and_then(Format::infer))
             .unwrap_or(Format::CompactJson);
         if let Some(infile) =
             infile.and_then(|infile| if infile == "-" { None } else { Some(infile) })

cli/src/args/search.rs

@@ -193,13 +193,10 @@ impl Run for Args {
         let sender = if self.stream { Some(sender) } else { None };
         #[cfg(feature = "duckdb")]
         {
-            if self.duckdb.unwrap_or_else(|| {
-                tracing::info!(
-                    "inferring whether to use duckdb based on href '{}'",
-                    self.href
-                );
-                stac::geoparquet::has_extension(&self.href)
-            }) {
+            if self
+                .duckdb
+                .unwrap_or_else(|| stac::geoparquet::has_extension(&self.href))
+            {
                 search_geoparquet(self.href, search, sender, self.max_items).await
             } else {
                 search_api(self.href, search, sender, self.max_items).await

cli/src/args/serve.rs

@@ -145,7 +145,7 @@ impl Run for Args {
                 backend.add_items(items).await?;
             }
         } else if !items.is_empty() {
-            let collection_ids: Vec<_> = items.into_keys().filter_map(|o| o).collect();
+            let collection_ids: Vec<_> = items.into_keys().flatten().collect();
             warn!("--create-collections=false, but some items don't have collections and will not be loaded (collection ids: {})", collection_ids.join(","));
         }
 

cli/src/args/validate.rs

@@ -22,7 +22,7 @@ impl Run for Args {
                 stac::Value::Item(item) => format!("[item={}] ", item.id),
                 stac::Value::Catalog(catalog) => format!("[catalog={}] ", catalog.id),
                 stac::Value::Collection(collection) => format!("[collection={}] ", collection.id),
-                stac::Value::ItemCollection(_) => format!("[item-collection] "),
+                stac::Value::ItemCollection(_) => "[item-collection] ".to_string(),
             };
             for error in errors {
                 let message = format!(

cli/src/main.rs

@@ -1,6 +1,5 @@
 use clap::Parser;
 use stac_cli::Args;
-use tracing_subscriber;
 
 #[tokio::main]
 async fn main() {

cli/src/python.rs

@@ -4,7 +4,6 @@ use pyo3::{
     prelude::{PyModule, PyModuleMethods},
     pyfunction, pymodule, wrap_pyfunction, Bound, PyResult,
 };
-use tracing_subscriber;
 
 #[pyfunction]
 fn main() -> PyResult<i64> {

duckdb/Cargo.toml

@@ -3,9 +3,6 @@ name = "stac-duckdb"
 version = "0.1.0"
 edition = "2021"
 
-[features]
-bundled = ["duckdb/bundled"]
-
 [dependencies]
 arrow = "52"
 duckdb = "1"