Update deps

Cargo.toml

@@ -80,7 +80,7 @@ size_format = "1.0.2"
 spreet = { version = "0.11", default-features = false }
 sqlite-compressions = { version = "0.2.12", default-features = false, features = ["bsdiffraw", "gzip"] }
 sqlite-hashes = { version = "0.7.3", default-features = false, features = ["md5", "aggregate", "hex"] }
-sqlx = { version = "0.7", features = ["sqlite", "runtime-tokio"] }
+sqlx = { version = "0.8", features = ["sqlite", "runtime-tokio"] }
 static-files = "0.2"
 subst = { version = "0.3", features = ["yaml"] }
 thiserror = "1"

justfile

@@ -62,6 +62,11 @@ clean-martin-ui:
 clean-test:
     rm -rf tests/output
 
+# Update dependencies, including breaking changes
+update:
+    cargo +nightly -Z unstable-options update --breaking
+    cargo update
+
 # Start a test database
 start: (docker-up "db") docker-is-ready
 

martin/src/srv/server.rs

@@ -3,13 +3,6 @@ use std::pin::Pin;
 use std::string::ToString;
 use std::time::Duration;
 
-use crate::config::ServerState;
-use crate::source::TileCatalog;
-use crate::srv::config::{SrvConfig, KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT};
-use crate::srv::tiles::get_tile;
-use crate::srv::tiles_info::get_source_info;
-use crate::MartinError::BindingError;
-use crate::MartinResult;
 use actix_cors::Cors;
 use actix_web::error::ErrorInternalServerError;
 use actix_web::http::header::CACHE_CONTROL;
@@ -24,6 +17,13 @@ use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "webui")]
 use crate::args::WebUiMode;
+use crate::config::ServerState;
+use crate::source::TileCatalog;
+use crate::srv::config::{SrvConfig, KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT};
+use crate::srv::tiles::get_tile;
+use crate::srv::tiles_info::get_source_info;
+use crate::MartinError::BindingError;
+use crate::MartinResult;
 
 #[cfg(feature = "webui")]
 mod webui {

mbtiles/src/queries.rs

@@ -61,12 +61,7 @@ where
          ) AS is_valid;"
     );
 
-    Ok(sql
-        .fetch_one(&mut *conn)
-        .await?
-        .is_valid
-        .unwrap_or_default()
-        == 1)
+    Ok(sql.fetch_one(&mut *conn).await?.is_valid == 1)
 }
 
 /// Check if `MBTiles` has a table or a view named `tiles_with_hash` with needed fields
@@ -90,12 +85,7 @@ where
        ) as is_valid;"
     );
 
-    Ok(sql
-        .fetch_one(&mut *conn)
-        .await?
-        .is_valid
-        .unwrap_or_default()
-        == 1)
+    Ok(sql.fetch_one(&mut *conn).await?.is_valid == 1)
 }
 
 pub async fn is_flat_with_hash_tables_type<T>(conn: &mut T) -> MbtResult<bool>
@@ -115,7 +105,7 @@ where
 
     let is_valid = sql.fetch_one(&mut *conn).await?.is_valid;
 
-    Ok(is_valid.unwrap_or_default() == 1 && has_tiles_with_hash(&mut *conn).await?)
+    Ok(is_valid == 1 && has_tiles_with_hash(&mut *conn).await?)
 }
 
 pub async fn is_flat_tables_type<T>(conn: &mut T) -> MbtResult<bool>
@@ -144,12 +134,7 @@ where
          ) as is_valid;"
     );
 
-    Ok(sql
-        .fetch_one(&mut *conn)
-        .await?
-        .is_valid
-        .unwrap_or_default()
-        == 1)
+    Ok(sql.fetch_one(&mut *conn).await?.is_valid == 1)
 }
 
 pub async fn create_metadata_table<T>(conn: &mut T) -> MbtResult<()>
@@ -409,8 +394,10 @@ FROM tiles;"
     .fetch_one(conn)
     .await?;
 
-    let min_zoom = validate_zoom(info.min_zoom, "zoom_level")?;
-    let max_zoom = validate_zoom(info.max_zoom, "zoom_level")?;
+    #[allow(clippy::cast_possible_truncation)]
+    let min_zoom = validate_zoom(info.min_zoom.map(|v| v as i32), "zoom_level")?;
+    #[allow(clippy::cast_possible_truncation)]
+    let max_zoom = validate_zoom(info.max_zoom.map(|v| v as i32), "zoom_level")?;
 
     match (min_zoom, max_zoom) {
         (Some(min_zoom), Some(max_zoom)) => Ok(Some((min_zoom, max_zoom))),