From c344331b14d51e85f6fd9f24116bd3d1cbbf00e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pepe=20M=C3=A1rquez=20Romero?= Date: Tue, 8 Aug 2023 13:31:00 +0200 Subject: [PATCH 1/2] try to fang error --- Cargo.lock | 57 ++++++++++++++++++++++---------------- Cargo.toml | 3 +- src/bot/telegram_client.rs | 12 ++------ 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7aa07c15..cd5595a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,9 +143,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "libc", ] @@ -541,14 +541,14 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fang" version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889184a3a3baaeadd99dd297c49475e27204fd0394cb61f04b402e825d6823db" +source = "git+https://github.com/ayrat555/fang.git?branch=ft/derive-macro-fang-error#2aae0aa63911bb9622e279d02e3fe15f08bafa10" dependencies = [ "chrono", "cron", "diesel", "diesel-derive-enum", "dotenvy", + "fang-derive-error", "hex", "log", "serde", @@ -561,6 +561,15 @@ dependencies = [ "uuid", ] +[[package]] +name = "fang-derive-error" +version = "0.1.0" +source = "git+https://github.com/ayrat555/fang.git?branch=ft/derive-macro-fang-error#2aae0aa63911bb9622e279d02e3fe15f08bafa10" +dependencies = [ + "quote", + "syn 2.0.28", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -1003,9 +1012,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libnghttp2-sys" -version = "0.1.7+1.45.0" +version = "0.1.8+1.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" +checksum = "4fae956c192dadcdb5dace96db71fa0b827333cce7c7b38dc71446f024d8a340" dependencies = [ "cc", "libc", @@ -1176,9 +1185,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -1267,18 +1276,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -1287,9 +1296,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" [[package]] name = "pin-utils" @@ -1456,9 +1465,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -1468,9 +1477,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -1503,9 +1512,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" dependencies = [ "bitflags 2.3.3", "errno", @@ -1546,18 +1555,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index cd9fcc27..2a34dc8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,8 @@ chrono = "0.4" diesel = { version = "2", features = ["postgres","r2d2"] } dotenvy = "0.15" pretty_env_logger = "0.5" -fang = { version = "0.10.3", features = ["blocking"], default-features = false } +#fang = { version = 10.3, features = ["blocking"], default-features = false } +fang = { git = "https://github.com/ayrat555/fang.git", branch = "ft/derive-macro-fang-error", features = ["blocking" , "derive-error"], default-features = false } feed-rs = "1.3.0" frankenstein = { version = "0.26.0", default-features = false, features = ["telegram-trait"] } handlebars = "4" diff --git a/src/bot/telegram_client.rs b/src/bot/telegram_client.rs index a6a187a4..c979e90d 100644 --- a/src/bot/telegram_client.rs +++ b/src/bot/telegram_client.rs @@ -1,6 +1,8 @@ use crate::config::Config; use crate::http_client; +use core::fmt::Debug; use fang::FangError; +use fang::ToFangError; use frankenstein::AllowedUpdate; use frankenstein::DeleteMessageParams; use frankenstein::ErrorResponse; @@ -28,7 +30,7 @@ pub struct Api { pub http_client: HttpClient, } -#[derive(Debug)] +#[derive(Debug, ToFangError)] pub enum Error { HttpError(HttpError), ApiError(ErrorResponse), @@ -46,14 +48,6 @@ impl Default for Api { } } -impl From for FangError { - fn from(error: Error) -> Self { - let description = format!("telegram error: {error:?}"); - - Self { description } - } -} - #[derive(TypedBuilder)] pub struct SimpleMessageParams { chat_id: i64, From fb9cb94cd976c921fa172c08387ebc6a5ed2a97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pepe=20M=C3=A1rquez=20Romero?= Date: Fri, 25 Aug 2023 13:33:54 +0200 Subject: [PATCH 2/2] tested fang fix in el monitorro --- Cargo.lock | 10 ++++------ Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41d5b5f3..372b990f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -541,8 +541,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fang" version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1f1f5613f9e50155d8cfa8af17bfb2373da33cb6b2283674a32203b5ccfbfa" +source = "git+https://github.com/ayrat555/fang?branch=fix_new_task_struct#3211171ac834320c4849c2e61431e8a34473a2c9" dependencies = [ "chrono", "cron", @@ -565,10 +564,11 @@ dependencies = [ [[package]] name = "fang-derive-error" version = "0.1.0" -source = "git+https://github.com/ayrat555/fang.git?branch=ft/derive-macro-fang-error#2aae0aa63911bb9622e279d02e3fe15f08bafa10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f5641b79902b8b40295f05db8a94277897f58f23645dc32057a0b8423496f2" dependencies = [ "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1516,7 +1516,6 @@ name = "rustix" version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" - dependencies = [ "bitflags 2.4.0", "errno", @@ -1566,7 +1565,6 @@ dependencies = [ [[package]] name = "serde_derive" - version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" diff --git a/Cargo.toml b/Cargo.toml index d1c32561..094ddfdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ chrono = "0.4" diesel = { version = "2", features = ["postgres","r2d2"] } dotenvy = "0.15" pretty_env_logger = "0.5" -fang = { version = "0.10.4", features = ["blocking"], default-features = false } +fang = { git = "https://github.com/ayrat555/fang", branch="fix_new_task_struct", features = ["blocking" , "derive-error"], default-features = false } feed-rs = "1.3.0" frankenstein = { version = "0.27.0", default-features = false, features = ["telegram-trait"] } handlebars = "4"