diff --git a/Cargo.lock b/Cargo.lock index 4723c52..b3a58fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "askama" version = "0.11.2" -source = "git+https://github.com/djc/askama.git#70c5784a9ebc1e2f9e97d5358c7b686111ea18f4" +source = "git+https://github.com/djc/askama.git#c9613ff6029ee58dc3f94c3dd955b905ed7fc9ef" dependencies = [ "askama_derive", "askama_escape", @@ -40,7 +40,7 @@ dependencies = [ [[package]] name = "askama_axum" version = "0.1.0" -source = "git+https://github.com/djc/askama.git#70c5784a9ebc1e2f9e97d5358c7b686111ea18f4" +source = "git+https://github.com/djc/askama.git#c9613ff6029ee58dc3f94c3dd955b905ed7fc9ef" dependencies = [ "askama", "axum-core", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "askama_derive" version = "0.12.0" -source = "git+https://github.com/djc/askama.git#70c5784a9ebc1e2f9e97d5358c7b686111ea18f4" +source = "git+https://github.com/djc/askama.git#c9613ff6029ee58dc3f94c3dd955b905ed7fc9ef" dependencies = [ "basic-toml", "mime", @@ -65,7 +65,7 @@ dependencies = [ [[package]] name = "askama_escape" version = "0.10.3" -source = "git+https://github.com/djc/askama.git#70c5784a9ebc1e2f9e97d5358c7b686111ea18f4" +source = "git+https://github.com/djc/askama.git#c9613ff6029ee58dc3f94c3dd955b905ed7fc9ef" [[package]] name = "async-trait" @@ -86,9 +86,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +checksum = "2bd379e511536bad07447f899300aa526e9bae8e6f66dc5e5ca45d7587b7c1ec" dependencies = [ "async-trait", "axum-core", @@ -111,7 +111,7 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http", + "tower-http 0.3.5", "tower-layer", "tower-service", ] @@ -241,7 +241,7 @@ dependencies = [ "serde_yaml", "time", "tokio", - "tower-http", + "tower-http 0.4.0", "tracing", "tracing-subscriber", ] @@ -995,9 +995,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "syn" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e159d99e6c2b93995d171050271edb50ecc5288fbc7cc17de8fdce4e58c14" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -1022,9 +1022,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "serde", @@ -1040,9 +1040,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -1135,6 +1135,25 @@ name = "tower-http" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ "bitflags", "bytes", @@ -1150,9 +1169,9 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3ffea95..10e3bf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,6 @@ serde = { version = "1.0", features = ["derive"] } serde_yaml = "0.9" time = "0.3" tokio = { version = "1.25", default-features = false, features = ["macros", "rt"] } -tower-http = { version = "0.3", features = ["fs"] } +tower-http = { version = "0.4", features = ["fs"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["time"] } diff --git a/src/main.rs b/src/main.rs index 7e05ff3..c30e1da 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,8 +41,7 @@ async fn init(logger_initialized: &mut bool) -> Result<()> { let app_state = AppState::build(config).await?; // The service for serving the static files. - let static_service = - get_service(ServeDir::new("static")).handle_error(|_| ready(StatusCode::NOT_FOUND)); + let static_service = get_service(ServeDir::new("static")); let routes = Router::new() .route("/", get(routes::index).post(routes::submit))