OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-10-24 09:57:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactoring

Browse source
This commit is contained in:
p0lunin 2020-01-01 20:01:26 +02:00
parent 585c161511
commit 60532be947
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/types/parse_mode.rs
View file

@ -2,9 +2,10 @@
// (for built ins there no warnings, but for (De)Serialize, there are) // (for built ins there no warnings, but for (De)Serialize, there are)
#![allow(deprecated)] #![allow(deprecated)]
use std::{str::FromStr, convert::TryFrom} use std::{str::FromStr, convert::TryFrom};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::convert::TryInto;
/// ## Formatting options /// ## Formatting options
/// The Bot API supports basic formatting for messages. You can use bold, /// The Bot API supports basic formatting for messages. You can use bold,
@ -137,6 +138,7 @@ impl TryFrom<&str> for ParseMode {
let normalized = value.to_lowercase(); let normalized = value.to_lowercase();
match normalized.as_ref() { match normalized.as_ref() {
"html" => Ok(ParseMode::HTML), "html" => Ok(ParseMode::HTML),
#[allow(depredecated)]
"markdown" => Ok(ParseMode::Markdown), "markdown" => Ok(ParseMode::Markdown),
_ => Err(()), _ => Err(()),
} }
@ -147,12 +149,7 @@ impl TryFrom<String> for ParseMode {
type Error = (); type Error = ();
fn try_from(value: String) -> Result<Self, Self::Error> { fn try_from(value: String) -> Result<Self, Self::Error> {
let normalized = value.to_lowercase(); value.as_str().try_into()
match normalized.as_ref() {
"html" => Ok(ParseMode::HTML),
"markdown" => Ok(ParseMode::Markdown),
_ => Err(()),
}
} }
} }
@ -160,12 +157,7 @@ impl FromStr for ParseMode {
type Err = (); type Err = ();
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
let normalized = s.to_lowercase(); s.try_into()
match normalized.as_ref() {
"html" => Ok(ParseMode::HTML),
"markdown" => Ok(ParseMode::Markdown),
_ => Err(()),
}
} }
} }