Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 8b3d5db8 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

AMADEUS: Fix warnings from clippy

parent 22d253c7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -395,19 +395,16 @@ impl Amadeus<'_> { ...@@ -395,19 +395,16 @@ impl Amadeus<'_> {
/// Handle quits/exits of the deamons /// Handle quits/exits of the deamons
fn handle_deamons_exit(&mut self) { fn handle_deamons_exit(&mut self) {
// Handle the deamon closing process. // Handle the deamon closing process.
if let Some(((socket,), status_deamon)) = &self.status_deamon { if let Some((_, status_deamon)) = &mut self.status_deamon {
if status_deamon.should_quit() { if status_deamon.should_quit() {
drop(socket);
self.lektord_status = None; self.lektord_status = None;
self.lektord_current = None; self.lektord_current = None;
status_deamon.join(); status_deamon.join();
self.status_deamon = None; self.status_deamon = None;
} }
}; };
if let Some(((socket_out, socket_in), deamon)) = &self.deamon { if let Some((_, deamon)) = &mut self.deamon {
if deamon.should_quit() { if deamon.should_quit() {
drop(socket_out);
drop(socket_in);
deamon.join(); deamon.join();
self.deamon = None; self.deamon = None;
} }
......
...@@ -101,10 +101,12 @@ impl<'a> WindowBuilder<'a> { ...@@ -101,10 +101,12 @@ impl<'a> WindowBuilder<'a> {
.clicked() .clicked()
.then(|| flag_copy = false); .then(|| flag_copy = false);
self.actions if let Some(actions) = self.actions {
.map(|actions| render_action_menu(ui, &actions, "▶", &mut temp_actions)); render_action_menu(ui, &actions, "▶", &mut temp_actions)
self.warning_actions }
.map(|actions| render_action_menu(ui, &actions, "⚠", &mut temp_actions)); if let Some(actions) = self.warning_actions {
render_action_menu(ui, &actions, "⚠", &mut temp_actions)
}
ui.colored_label(constants::get_text_color(self.dark_mode), self.name); ui.colored_label(constants::get_text_color(self.dark_mode), self.name);
}); });
......
...@@ -94,7 +94,12 @@ impl LektorConnexion { ...@@ -94,7 +94,12 @@ impl LektorConnexion {
match self.read_replies() { match self.read_replies() {
Err(e) => return Err(e), Err(e) => return Err(e),
Ok((res, _)) if res.is_empty() => return Ok(()), Ok((res, _)) if res.is_empty() => return Ok(()),
Ok((res, None)) => return Ok(previous_ret.extend(res)), Ok((res, None)) => {
return {
previous_ret.extend(res);
Ok(())
}
}
Ok((res, Some(cont))) => { Ok((res, Some(cont))) => {
previous_ret.extend(res); previous_ret.extend(res);
self.write_string( self.write_string(
......
...@@ -315,8 +315,8 @@ impl FromLektorResponse for LektorCurrentKaraResponse { ...@@ -315,8 +315,8 @@ impl FromLektorResponse for LektorCurrentKaraResponse {
let song_type_number = response.pop("type")?; let song_type_number = response.pop("type")?;
let (song_type, song_number) = match song_type_number.find(char::is_numeric) { let (song_type, song_number) = match song_type_number.find(char::is_numeric) {
Some(index) => ( Some(index) => (
(&song_type_number[..index]).to_owned(), song_type_number[..index].to_owned(),
match (&song_type_number[index..]).parse::<usize>() { match song_type_number[index..].parse::<usize>() {
Ok(x) => Some(x), Ok(x) => Some(x),
Err(_) => None, Err(_) => None,
}, },
......
use lkt_lib::*; use lkt_lib::*;
fn main() { fn main() {
let mut lektor = LektorConnexion::new("localhost".to_owned(), 6600).unwrap(); let mut lektor = LektorConnexion::new("localhost", 6600).unwrap();
if lektor.send_query(LektorQuery::Ping).is_ok() {} if lektor.send_query(LektorQuery::Ping).is_ok() {}
if let Ok(LektorResponse::CurrentKara(current)) = lektor.send_query(LektorQuery::CurrentKara) { if let Ok(LektorResponse::CurrentKara(current)) = lektor.send_query(LektorQuery::CurrentKara) {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter