From dccc0e871e987775fceed556c71a521c8f84f916 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sat, 11 May 2024 13:51:22 +0300 Subject: [PATCH] Update deps --- server/Cargo.lock | 23 +++++++++++++---------- server/Cargo.toml | 5 +---- server/src/view.rs | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/Cargo.lock b/server/Cargo.lock index a02bc4b..f67c7ee 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -571,17 +571,19 @@ dependencies = [ ] [[package]] -name = "embed" -version = "0.1.0" -source = "git+https://github.com/RGBCube/embed-rs#7c2eb614db7947d5f12c02685c97404729e98acd" +name = "embd" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f44bd5e4300f535cebd9949a5d76f413ce2c2fe4f454bbfc854c3b53d70f16" dependencies = [ - "embed-macros", + "embd-macros", ] [[package]] -name = "embed-macros" -version = "0.1.0" -source = "git+https://github.com/RGBCube/embed-rs#7c2eb614db7947d5f12c02685c97404729e98acd" +name = "embd-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d8aff0b18a634834d77cf70effb2ee3f5ab2b4f36f1caa7fabe213ac7767b0f" dependencies = [ "proc-macro2", "quote", @@ -757,7 +759,7 @@ dependencies = [ "actix-cors", "actix-web", "chrono", - "embed", + "embd", "maud", "serde", "sqlx", @@ -1341,8 +1343,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.75" -source = "git+https://github.com/RGBCube/proc-macro2#e1713f29a5488360d96178081ac0fca3d4abdb8a" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] diff --git a/server/Cargo.toml b/server/Cargo.toml index 0f4f475..abfc2ca 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -11,14 +11,11 @@ edition = "2021" actix-cors = "0.6.5" actix-web = "4.4.0" chrono = "0.4.31" -embed = { git = "https://github.com/RGBCube/embed-rs" } +embd = "0.1.1" maud = { version = "0.25.0", features = [ "actix-web" ] } serde = { version = "1.0.192", features = [ "derive" ] } sqlx = { version = "0.7.3", features = [ "chrono", "sqlite", "runtime-tokio" ] } tokio = { version = "1.34.0", features = [ "full" ] } -[patch.crates-io] -proc-macro2 = { git = "https://github.com/RGBCube/proc-macro2" } - [profile.dev] incremental = true diff --git a/server/src/view.rs b/server/src/view.rs index 530bd8e..79d1d4c 100644 --- a/server/src/view.rs +++ b/server/src/view.rs @@ -49,7 +49,7 @@ async fn view(data: Data) -> web::Result { (DOCTYPE) style { - (PreEscaped(embed::string!("view.css"))) + (PreEscaped(embd::string!("view.css"))) } ul id="reminders" { @@ -64,7 +64,7 @@ async fn view(data: Data) -> web::Result { .clock {} script { - (PreEscaped(embed::string!("alert.js"))) + (PreEscaped(embd::string!("alert.js"))) } }) }