From 01a8d7cc4287c90525522b25badf99868d220953 Mon Sep 17 00:00:00 2001 From: Aleksander <170264518+t-aleksander@users.noreply.github.com> Date: Fri, 21 Jun 2024 12:15:54 +0200 Subject: [PATCH] try without path interpolation --- Cargo.lock | 58 --------------------------------------------------- Cargo.toml | 5 +---- src/assets.rs | 2 +- 3 files changed, 2 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b776d163..60085dcaf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1096,27 +1096,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "displaydoc" version = "0.2.4" @@ -2275,16 +2254,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.5.0", - "libc", -] - [[package]] name = "libsqlite3-sys" version = "0.27.0" @@ -2715,12 +2684,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-float" version = "2.10.1" @@ -3322,17 +3285,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - [[package]] name = "regex" version = "1.10.4" @@ -3539,7 +3491,6 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "shellexpand", "syn 2.0.60", "walkdir", ] @@ -4023,15 +3974,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shellexpand" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" -dependencies = [ - "dirs", -] - [[package]] name = "signature" version = "2.2.0" diff --git a/Cargo.toml b/Cargo.toml index 74f8a2414..a9a340f92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,10 +69,7 @@ ssh-key = "0.6" struct-patch = "0.4" tera = "1.19" thiserror = "1.0" -rust-embed = { version = "8.4.0", features = [ - "include-exclude", - "interpolate-folder-path", -] } +rust-embed = { version = "8.4.0", features = ["include-exclude"] } mime_guess = "2.0.4" # match axum-extra -> cookies time = { version = "0.3", default-features = false } diff --git a/src/assets.rs b/src/assets.rs index dd3f717b0..0ae3ddc74 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -23,7 +23,7 @@ pub async fn svg(uri: Uri) -> impl IntoResponse { } #[derive(Embed)] -#[folder = "$CARGO_MANIFEST_DIR/web/"] +#[folder = "web/"] #[include = "dist/*"] #[include = "src/shared/images/*"] struct WebAsset;