mirror of
https://github.com/teloxide/teloxide.git
synced 2024-12-22 22:46:39 +01:00
Merge pull request #704 from teloxide/update_macros
update `teloxide-macros`
This commit is contained in:
commit
748ff1da11
4 changed files with 13 additions and 70 deletions
|
@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
<!-- TODO: use a version once teloxide-macros is released -->
|
||||||
|
- Updated `teloxide-macros` see its [changelog](https://github.com/teloxide/teloxide-macros/blob/master/CHANGELOG.md#unreleased) for more
|
||||||
- `UpdateListener` now has an associated type `Err` instead of a generic
|
- `UpdateListener` now has an associated type `Err` instead of a generic
|
||||||
- `AsUpdateStream` now has an associated type `StreamErr` instead of a generic
|
- `AsUpdateStream` now has an associated type `StreamErr` instead of a generic
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ full = [
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
teloxide-core = { version = "0.7.0", default-features = false }
|
teloxide-core = { version = "0.7.0", default-features = false }
|
||||||
teloxide-macros = { version = "0.6.3", optional = true }
|
#teloxide-macros = { version = "0.6.3", optional = true }
|
||||||
|
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
|
@ -67,7 +67,7 @@ dptree = "0.3.0"
|
||||||
|
|
||||||
# These lines are used only for development.
|
# These lines are used only for development.
|
||||||
# teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "b13393d", default-features = false }
|
# teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "b13393d", default-features = false }
|
||||||
# teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "44d91c5", optional = true }
|
teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "0e79c37", optional = true }
|
||||||
# dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" }
|
# dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" }
|
||||||
|
|
||||||
tokio = { version = "1.8", features = ["fs"] }
|
tokio = { version = "1.8", features = ["fs"] }
|
||||||
|
|
|
@ -233,8 +233,8 @@ fn rename_rules() {
|
||||||
GggGgg,
|
GggGgg,
|
||||||
#[command(rename = "SCREAMING-KEBAB-CASE")]
|
#[command(rename = "SCREAMING-KEBAB-CASE")]
|
||||||
HhhHhh,
|
HhhHhh,
|
||||||
#[command(rename = "Bar")]
|
//#[command(rename = "Bar")]
|
||||||
Foo,
|
//Foo,
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_eq!(DefaultCommands::AaaAaa, DefaultCommands::parse("/aaaaaa", "").unwrap());
|
assert_eq!(DefaultCommands::AaaAaa, DefaultCommands::parse("/aaaaaa", "").unwrap());
|
||||||
|
@ -245,10 +245,15 @@ fn rename_rules() {
|
||||||
assert_eq!(DefaultCommands::FffFff, DefaultCommands::parse("/FFF_FFF", "").unwrap());
|
assert_eq!(DefaultCommands::FffFff, DefaultCommands::parse("/FFF_FFF", "").unwrap());
|
||||||
assert_eq!(DefaultCommands::GggGgg, DefaultCommands::parse("/ggg-ggg", "").unwrap());
|
assert_eq!(DefaultCommands::GggGgg, DefaultCommands::parse("/ggg-ggg", "").unwrap());
|
||||||
assert_eq!(DefaultCommands::HhhHhh, DefaultCommands::parse("/HHH-HHH", "").unwrap());
|
assert_eq!(DefaultCommands::HhhHhh, DefaultCommands::parse("/HHH-HHH", "").unwrap());
|
||||||
assert_eq!(DefaultCommands::Foo, DefaultCommands::parse("/Bar", "").unwrap());
|
//assert_eq!(DefaultCommands::Foo, DefaultCommands::parse("/Bar",
|
||||||
|
// "").unwrap());
|
||||||
|
|
||||||
|
// assert_eq!(
|
||||||
|
// "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/
|
||||||
|
// HHH-HHH\n/Bar", DefaultCommands::descriptions().to_string()
|
||||||
|
// );
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
"/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/HHH-HHH\n/Bar",
|
"/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/HHH-HHH",
|
||||||
DefaultCommands::descriptions().to_string()
|
DefaultCommands::descriptions().to_string()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
#![allow(deprecated)]
|
|
||||||
|
|
||||||
#[cfg(feature = "macros")]
|
|
||||||
use teloxide::macros::DialogueState;
|
|
||||||
// We put tests here because macro expand in unit tests in the crate was a
|
|
||||||
// failure
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[cfg(feature = "macros")]
|
|
||||||
fn compile_test() {
|
|
||||||
#[allow(dead_code)]
|
|
||||||
#[derive(DialogueState, Clone)]
|
|
||||||
#[handler_out(Result<(), teloxide::RequestError>)]
|
|
||||||
enum State {
|
|
||||||
#[handler(handle_start)]
|
|
||||||
Start,
|
|
||||||
|
|
||||||
#[handler(handle_have_data)]
|
|
||||||
HaveData(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for State {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::Start
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn handle_start() -> Result<(), teloxide::RequestError> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn handle_have_data() -> Result<(), teloxide::RequestError> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
#[cfg(feature = "macros")]
|
|
||||||
fn compile_test_generics() {
|
|
||||||
#[allow(dead_code)]
|
|
||||||
#[derive(DialogueState, Clone)]
|
|
||||||
#[handler_out(Result<(), teloxide::RequestError>)]
|
|
||||||
enum State<X: Clone + Send + Sync + 'static> {
|
|
||||||
#[handler(handle_start)]
|
|
||||||
Start,
|
|
||||||
|
|
||||||
#[handler(handle_have_data)]
|
|
||||||
HaveData(X),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<X: Clone + Send + Sync + 'static> Default for State<X> {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::Start
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn handle_start() -> Result<(), teloxide::RequestError> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn handle_have_data() -> Result<(), teloxide::RequestError> {
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in a new issue