diff --git a/Cargo.lock b/Cargo.lock index 0d3e998..343d280 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core", "bytes", @@ -174,8 +174,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", + "serde_core", "serde_json", "serde_path_to_error", "serde_urlencoded", @@ -189,9 +188,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", @@ -200,7 +199,6 @@ dependencies = [ "http-body-util", "mime", "pin-project-lite", - "rustversion", "sync_wrapper", "tower-layer", "tower-service", @@ -254,9 +252,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" [[package]] name = "cc" @@ -539,6 +537,7 @@ version = "0.1.0" dependencies = [ "ab_glyph", "axum", + "bytes", "csscolorparser", "image", "imageproc", @@ -1453,12 +1452,6 @@ dependencies = [ "owned_ttf_parser 0.15.2", ] -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - [[package]] name = "ryu" version = "1.0.18" @@ -1771,9 +1764,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", @@ -1809,9 +1802,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -1832,9 +1825,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", diff --git a/Cargo.toml b/Cargo.toml index 92f2203..1e69202 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,11 +6,12 @@ authors = ["Erik Vroon"] publish = false [dependencies] -axum = "0.8.4" +axum = "0.8.7" +bytes = "1.11.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.145" tokio = { version = "1.48", features = ["full"] } -tracing = "0.1" +tracing = "0.1.44" tracing-subscriber = { version = "0.3", features = ["env-filter"] } ab_glyph = "0.2.32" @@ -19,4 +20,4 @@ imageproc = "0.25.0" csscolorparser = "0.8.1" svg = "0.18.0" rusttype = "0.9.3" -tower-http = { version = "0.6.7", features = ["fs"] } +tower-http = { version = "0.6.8", features = ["fs"] } diff --git a/src/main.rs b/src/main.rs index 9b4fcfb..619a774 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,7 +84,7 @@ async fn image_handler( query_params: Query, ) -> impl IntoResponse { let content_type = query_params.filetype.get_content_type(); - let (width, height) = (width.max(10).min(3200), height.max(10).min(3200)); + let (width, height) = (width.clamp(10, 3200), height.clamp(10, 3200)); let result = task::spawn_blocking(move || { query_params.filetype.get_render_func()(