Clippy lint

This commit is contained in:
AB
2021-01-05 05:17:22 +03:00
parent e09047bb5b
commit 3136bce84f
4 changed files with 12 additions and 16 deletions

View File

@ -13,7 +13,7 @@ use mystem::Tense::{Inpresent, Past};
use rand::seq::SliceRandom;
use rand::Rng;
use regex::Regex;
use silicon;
use sqlparser::ast::Statement;
use sqlparser::dialect::GenericDialect;
use sqlparser::parser::Parser;
@ -475,7 +475,7 @@ impl Execute for Omedeto {
.filter(|m| re.is_match(m))
.map(|m| m.split(' ').map(|s| s.to_string()).collect::<Vec<String>>()[1].clone())
.map(|m| {
let stem = mystem.stemming(m.clone()).unwrap_or_default();
let stem = mystem.stemming(m).unwrap_or_default();
if stem.is_empty() {
} else if stem[0].lex.is_empty() {
@ -494,9 +494,9 @@ impl Execute for Omedeto {
.facts
.contains(&mystem::Fact::Gender(Feminine))
{
fm = fm + 1;
fm += 1;
} else {
mu = mu + 1;
mu += 1;
}
}
false => (),
@ -508,11 +508,7 @@ impl Execute for Omedeto {
})
.for_each(drop);
//debug!("fm - {}, mu - {}", fm, mu);
if fm >= mu {
true
} else {
false
}
fm >= mu
};
//debug!("Is Feminine - {}", fem);
let result = format!(

View File

@ -54,7 +54,7 @@ pub(crate) fn get_user(id: telegram_bot::UserId) -> Result<telegram_bot::User, e
})
}
if users.len() == 0 {
if users.is_empty() {
Err(errors::Error::UserNotFound)
} else {
Ok(users[0].clone())
@ -74,7 +74,7 @@ pub(crate) fn get_conf(id: telegram_bot::ChatId) -> Result<Conf, errors::Error>
date: row.get(2)?,
})
}
if confs.len() == 0 {
if confs.is_empty() {
Err(errors::Error::ConfNotFound)
} else {
Ok(confs[0].clone())

View File

@ -57,18 +57,18 @@ impl From<io_error> for Error {
impl From<serde_error> for Error {
fn from(e: serde_error) -> Error {
return Error::JsonParseError(e);
Error::JsonParseError(e)
}
}
impl From<popen_error> for Error {
fn from(e: popen_error) -> Error {
return Error::PopenError(e);
Error::PopenError(e)
}
}
impl From<mystem_error> for Error {
fn from(e: mystem_error) -> Error {
return Error::MystemError(e);
Error::MystemError(e)
}
}

View File

@ -13,12 +13,12 @@ pub(crate) fn get_title(message: &Message) -> String {
match &message.chat {
MessageChat::Supergroup(chat) => chat.title.clone(),
MessageChat::Group(chat) => chat.title.clone(),
MessageChat::Private(_) => format!("PRIVATE"),
MessageChat::Private(_) => "PRIVATE".to_string(),
_ => "PRIVATE".to_string(),
}
}
pub(crate) async fn create_dir(dir: &String) -> () {
pub(crate) async fn create_dir(dir: &String) {
match fs_create_dir(dir) {
Ok(_) => info!("Dir {} created.", dir),
Err(_) => (),