diff --git a/src/types/non_telegram_types/language_code.rs b/src/types/non_telegram_types/language_code.rs deleted file mode 100644 index 7ca87e6b..00000000 --- a/src/types/non_telegram_types/language_code.rs +++ /dev/null @@ -1,193 +0,0 @@ -use serde::{Deserialize, Serialize}; - -#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)] -#[serde(rename_all = "lowercase")] -pub enum LanguageCode { - AA, - AB, - AE, - AF, - AK, - AM, - AN, - AR, - AS, - AV, - AY, - AZ, - BA, - BE, - BG, - BH, - BI, - BM, - BN, - BO, - BR, - BS, - CA, - CE, - CH, - CO, - CR, - CS, - CU, - CV, - CY, - DA, - DE, - DV, - DZ, - EE, - EL, - EN, - EO, - ES, - ET, - EU, - FA, - FF, - FI, - FJ, - FO, - FR, - FY, - GA, - GD, - GL, - GN, - GU, - GV, - HA, - HE, - HI, - HO, - HR, - HT, - HU, - HY, - HZ, - IA, - ID, - IE, - IG, - II, - IK, - IO, - IS, - IT, - IU, - JA, - JV, - KA, - KG, - KI, - KJ, - KK, - KL, - KM, - KN, - KO, - KR, - KS, - KU, - KV, - KW, - KY, - LA, - LB, - LG, - LI, - LN, - LO, - LT, - LU, - LV, - MG, - MH, - MI, - MK, - ML, - MN, - MR, - MS, - MT, - MY, - NA, - NB, - ND, - NE, - NG, - NL, - NN, - NO, - NR, - NV, - NY, - OC, - OJ, - OM, - OR, - OS, - PA, - PI, - PL, - PS, - PT, - QU, - RM, - RN, - RO, - RU, - RW, - SA, - SC, - SD, - SE, - SG, - SI, - SK, - SL, - SM, - SN, - SO, - SQ, - SR, - SS, - ST, - SU, - SV, - SW, - TA, - TE, - TG, - TH, - TI, - TK, - TL, - TN, - TO, - TR, - TS, - TT, - TW, - TY, - UG, - UK, - UR, - UZ, - VE, - VI, - VO, - WA, - WO, - XH, - YI, - YO, - ZA, - ZH, - ZU, - - #[serde(other)] - Other, -} diff --git a/src/types/non_telegram_types/mod.rs b/src/types/non_telegram_types/mod.rs index 2202122b..8add54b6 100644 --- a/src/types/non_telegram_types/mod.rs +++ b/src/types/non_telegram_types/mod.rs @@ -1,9 +1,7 @@ pub use country_code::*; pub use currency::*; -pub use language_code::*; pub use mime_wrapper::*; mod country_code; mod currency; -mod language_code; mod mime_wrapper; diff --git a/src/types/update.rs b/src/types/update.rs index 5870c13f..39b8a1aa 100644 --- a/src/types/update.rs +++ b/src/types/update.rs @@ -107,8 +107,8 @@ impl Update { #[cfg(test)] mod test { use crate::types::{ - Chat, ChatKind, ForwardKind, LanguageCode, MediaKind, Message, - MessageKind, Update, UpdateKind, User, + Chat, ChatKind, ForwardKind, MediaKind, Message, MessageKind, Update, + UpdateKind, User, }; // TODO: more tests for deserialization @@ -158,7 +158,7 @@ mod test { first_name: String::from("Waffle"), last_name: None, username: Some(String::from("WaffleLapkin")), - language_code: Some(LanguageCode::EN), + language_code: Some(String::from("en")), }), forward_kind: ForwardKind::Origin { reply_to_message: None, diff --git a/src/types/user.rs b/src/types/user.rs index aaf2e8f5..1ebac900 100644 --- a/src/types/user.rs +++ b/src/types/user.rs @@ -1,4 +1,3 @@ -use crate::types::LanguageCode; use serde::{Deserialize, Serialize}; /// This object represents a Telegram user or bot. @@ -25,7 +24,7 @@ pub struct User { /// [IETF language tag] of the user's language. /// /// [IETF language tag]: https://en.wikipedia.org/wiki/IETF_language_tag - pub language_code: Option, + pub language_code: Option, } impl User { @@ -86,7 +85,7 @@ mod tests { first_name: "firstName".to_string(), last_name: Some("lastName".to_string()), username: Some("Username".to_string()), - language_code: Some(LanguageCode::RU), + language_code: Some(String::from("ru")), }; let actual = serde_json::from_str::(&json).unwrap(); assert_eq!(actual, expected) diff --git a/src/utils/command.rs b/src/utils/command.rs index b5bbc98e..b69d4b9b 100644 --- a/src/utils/command.rs +++ b/src/utils/command.rs @@ -134,7 +134,7 @@ where /// /// `prefix`: symbols, which denote start of a command. /// -/// Example: +/// ## Example /// ``` /// use teloxide::utils::command::parse_command_with_prefix; ///