From 64359db3dad7623a847cfade700ea7971c708868 Mon Sep 17 00:00:00 2001 From: Hirrolot Date: Thu, 6 Oct 2022 22:35:32 +0600 Subject: [PATCH 1/2] Update to the latest `teloxide-macros` --- Cargo.toml | 2 +- src/utils/command.rs | 2 +- tests/command.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5295cccd..537c56f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ dptree = "0.3.0" # These lines are used only for development. teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "00165e6", default-features = false } -teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "a2a79e29cb106a5d3052cf32a23e698db859cc2a", optional = true } +teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "e715105", optional = true } # dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" } tokio = { version = "1.8", features = ["fs"] } diff --git a/src/utils/command.rs b/src/utils/command.rs index 57b9d5ff..24e001cf 100644 --- a/src/utils/command.rs +++ b/src/utils/command.rs @@ -194,7 +194,7 @@ pub use teloxide_macros::BotCommands; /// #[derive(BotCommands, PartialEq, Debug)] /// #[command(rename_rule = "lowercase")] /// enum Command { -/// #[command(parse_with = "accept_two_digits")] +/// #[command(parse_with = accept_two_digits)] /// Num(u8), /// } /// diff --git a/tests/command.rs b/tests/command.rs index a42fca6b..cac62e79 100644 --- a/tests/command.rs +++ b/tests/command.rs @@ -161,11 +161,11 @@ fn parse_custom_parser() { #[derive(BotCommands, Debug, PartialEq)] #[command(rename_rule = "lowercase")] enum DefaultCommands { - #[command(parse_with = "custom_parse_function")] + #[command(parse_with = custom_parse_function)] Start(u8, String), // Test . - #[command(parse_with = "parser::custom_parse_function")] + #[command(parse_with = parser::custom_parse_function)] TestPath(u8, String), Help, From 19830daf8d8371e571640d7b28cf7b85c46b14a5 Mon Sep 17 00:00:00 2001 From: Hirrolot Date: Thu, 6 Oct 2022 23:52:49 +0600 Subject: [PATCH 2/2] Update `teloxide-macros` to v0.7.0 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 537c56f6..72ccf372 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ full = [ [dependencies] # teloxide-core = { version = "0.7.0", default-features = false } -# teloxide-macros = { version = "0.6.3", optional = true } +teloxide-macros = { version = "0.7.0", optional = true } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } @@ -67,7 +67,7 @@ dptree = "0.3.0" # These lines are used only for development. teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "00165e6", default-features = false } -teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "e715105", optional = true } +# teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "e715105", optional = true } # dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" } tokio = { version = "1.8", features = ["fs"] }