From aa04c6ef5b05a9fea0cf4d041a1bc76aff11881a Mon Sep 17 00:00:00 2001 From: Oleg Sobolev Date: Mon, 25 Mar 2024 17:20:03 +0700 Subject: [PATCH] implement clippy suggestions --- src/channel.rs | 4 ++-- src/download.rs | 2 +- src/main.rs | 2 +- src/player.rs | 4 ++-- src/telegram.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/channel.rs b/src/channel.rs index f7ef12f..6c45f5d 100644 --- a/src/channel.rs +++ b/src/channel.rs @@ -40,10 +40,10 @@ impl Responder { pub fn channel() -> (Requester, Responder) { let (requester_tx, responder_rx) = mpsc::channel(); - return ( + ( Requester { tx: requester_tx }, Responder { rx: responder_rx }, - ); + ) } pub struct Request { diff --git a/src/download.rs b/src/download.rs index 37125fb..0dd5668 100644 --- a/src/download.rs +++ b/src/download.rs @@ -30,5 +30,5 @@ pub fn download_from_youtube(url: &str) -> Result { .replace('\n', "") + ".mp3"; - Ok(TrackInfo::new(&Path::new(filename.as_str()))) + Ok(TrackInfo::new(Path::new(filename.as_str()))) } diff --git a/src/main.rs b/src/main.rs index fceed9a..329e05e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ use music_bot::{player::MusicPlayer, telegram}; fn main() { - let player = MusicPlayer::new(); + let player = MusicPlayer::build(); let mut bot = telegram::TelegramBot::build(player); bot.telegram_main(); } diff --git a/src/player.rs b/src/player.rs index 2aa004b..3fd424c 100644 --- a/src/player.rs +++ b/src/player.rs @@ -37,7 +37,7 @@ struct Worker { } fn get_source(track: TrackInfo) -> Decoder> { - let file = BufReader::new(File::open(&track.path).unwrap()); + let file = BufReader::new(File::open(track.path).unwrap()); Decoder::new(file).unwrap() } @@ -100,7 +100,7 @@ impl Worker { } impl MusicPlayer { - pub fn new() -> MusicPlayer { + pub fn build() -> MusicPlayer { let (requester, responder) = channel::channel(); let _worker = thread::spawn(move || Worker::build(responder).main()); MusicPlayer { requester, _worker } diff --git a/src/telegram.rs b/src/telegram.rs index d777e77..b3527b3 100644 --- a/src/telegram.rs +++ b/src/telegram.rs @@ -48,7 +48,7 @@ impl TelegramBot { bot.send_message(msg.chat.id, "Added to the queue.").await?; }, Err(_) => { - bot.send_message(msg.chat.id, format!("Failed to download.")).await?; + bot.send_message(msg.chat.id, "Failed to download.").await?; } } }