From b6e0cc8e74188dc2ccc084adbe2bc49401518abb Mon Sep 17 00:00:00 2001 From: asur4s Date: Mon, 5 Sep 2022 12:39:11 -0400 Subject: [PATCH] Fix warning --- libs/hbb_common/src/platform/linux.rs | 1 - src/client/io_loop.rs | 1 + src/flutter.rs | 10 +++++++--- src/flutter_ffi.rs | 8 ++++---- src/rendezvous_mediator.rs | 3 ++- src/ui.rs | 1 + src/ui/remote.rs | 4 ++-- src/ui_interface.rs | 3 ++- src/ui_session_interface.rs | 3 +-- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/libs/hbb_common/src/platform/linux.rs b/libs/hbb_common/src/platform/linux.rs index d4d44270a..865033204 100644 --- a/libs/hbb_common/src/platform/linux.rs +++ b/libs/hbb_common/src/platform/linux.rs @@ -1,5 +1,4 @@ use crate::ResultType; -use std::sync::Mutex; pub fn get_display_server() -> String { let session = get_value_of_seat0(0); diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs index f1a481a36..d33e7b5ef 100644 --- a/src/client/io_loop.rs +++ b/src/client/io_loop.rs @@ -276,6 +276,7 @@ impl Remote { } // TODO + #[allow(dead_code)] fn load_last_jobs(&mut self) { log::info!("start load last jobs"); self.handler.clear_all_jobs(); diff --git a/src/flutter.rs b/src/flutter.rs index 7316dd2ed..ed42fbedb 100644 --- a/src/flutter.rs +++ b/src/flutter.rs @@ -12,7 +12,9 @@ use crate::ui_session_interface::{io_loop, InvokeUi, Session}; use crate::{client::*, flutter_ffi::EventToUI}; pub(super) const APP_TYPE_MAIN: &str = "main"; +#[allow(dead_code)] pub(super) const APP_TYPE_DESKTOP_REMOTE: &str = "remote"; +#[allow(dead_code)] pub(super) const APP_TYPE_DESKTOP_FILE_TRANSFER: &str = "file transfer"; lazy_static::lazy_static! { @@ -117,7 +119,7 @@ impl InvokeUi for FlutterHandler { ); } - fn job_error(&self, id: i32, err: String, file_num: i32) { + fn job_error(&self, id: i32, err: String, _file_num: i32) { self.push_event("job_error", vec![("id", &id.to_string()), ("err", &err)]); } @@ -132,6 +134,7 @@ impl InvokeUi for FlutterHandler { // todo!() } + #[allow(unused_variables)] fn add_job( &self, id: i32, @@ -148,6 +151,7 @@ impl InvokeUi for FlutterHandler { // todo!() } + #[allow(unused_variables)] fn confirm_delete_files(&self, id: i32, i: i32, name: String) { // todo!() } @@ -337,7 +341,7 @@ pub mod connection_manager { protobuf::Message as _, tokio::{ self, - sync::mpsc::{self, UnboundedReceiver, UnboundedSender}, + sync::mpsc::{self, UnboundedSender}, task::spawn_blocking, }, }; @@ -432,7 +436,7 @@ pub mod connection_manager { } Ok(Some(data)) => { match data { - Data::Login{id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled, restart} => { + Data::Login{id, is_file_transfer, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled: _file_transfer_enabled, restart} => { log::debug!("conn_id: {}", id); conn_id = id; // tx_file.send(ClipboardFileData::Enable((id, file_transfer_enabled))).ok(); diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index d2d49fff0..be4cadc7e 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -106,9 +106,9 @@ pub fn stop_global_event_stream(app_type: String) { .remove(&app_type); } -pub fn host_stop_system_key_propagate(stopped: bool) { +pub fn host_stop_system_key_propagate(_stopped: bool) { #[cfg(windows)] - crate::platform::windows::stop_system_key_propagate(stopped); + crate::platform::windows::stop_system_key_propagate(_stopped); } // FIXME: -> ResultType<()> cannot be parsed by frb_codegen @@ -388,7 +388,7 @@ pub fn session_create_dir(id: String, act_id: i32, path: String, is_remote: bool } pub fn session_read_local_dir_sync(id: String, path: String, show_hidden: bool) -> String { - if let Some(session) = SESSIONS.read().unwrap().get(&id) { + if let Some(_) = SESSIONS.read().unwrap().get(&id) { if let Ok(fd) = fs::read_dir(&fs::get_path(&path), show_hidden) { return make_fd_to_json(fd); } @@ -404,7 +404,7 @@ pub fn session_get_platform(id: String, is_remote: bool) -> String { } pub fn session_load_last_transfer_jobs(id: String) { - if let Some(session) = SESSIONS.read().unwrap().get(&id) { + if let Some(_) = SESSIONS.read().unwrap().get(&id) { // return session.load_last_jobs(); } else { // a tip for flutter dev diff --git a/src/rendezvous_mediator.rs b/src/rendezvous_mediator.rs index 802fed1de..9fc59816f 100644 --- a/src/rendezvous_mediator.rs +++ b/src/rendezvous_mediator.rs @@ -568,6 +568,7 @@ pub fn get_mac() -> String { "".to_owned() } +#[allow(dead_code)] fn lan_discovery() -> ResultType<()> { let addr = SocketAddr::from(([0, 0, 0, 0], get_broadcast_port())); let socket = std::net::UdpSocket::bind(addr)?; @@ -637,7 +638,7 @@ pub async fn query_online_states, Vec)>(ids: Vec ResultType { - let (mut rendezvous_server, _servers, _contained) = crate::get_rendezvous_server(1_000).await; + let (rendezvous_server, _servers, _contained) = crate::get_rendezvous_server(1_000).await; let tmp: Vec<&str> = rendezvous_server.split(":").collect(); if tmp.len() != 2 { bail!("Invalid server address: {}", rendezvous_server); diff --git a/src/ui.rs b/src/ui.rs index 0e754e622..f71ff8601 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -763,6 +763,7 @@ fn get_sound_inputs() -> Vec { .collect() } +#[allow(dead_code)] fn check_connect_status( reconnect: bool, ) -> ( diff --git a/src/ui/remote.rs b/src/ui/remote.rs index 4fb6dd605..4d2be50ed 100644 --- a/src/ui/remote.rs +++ b/src/ui/remote.rs @@ -2,7 +2,6 @@ use std::{ collections::HashMap, ops::{Deref, DerefMut}, sync::{ - atomic::{Ordering}, Arc, Mutex, }, }; @@ -29,7 +28,7 @@ use hbb_common::{allow_err, log, message_proto::*, rendezvous_proto::ConnType}; use crate::clipboard_file::*; use crate::{ client::*, - ui_session_interface::{InvokeUi, Session, IS_IN}, + ui_session_interface::{InvokeUi, Session}, }; type Video = AssetPtr; @@ -155,6 +154,7 @@ impl InvokeUi for SciterHandler { self.call("clearAllJobs", &make_args!()); } + #[allow(unused_variables)] fn add_job( &self, id: i32, diff --git a/src/ui_interface.rs b/src/ui_interface.rs index a8e3be980..75dead204 100644 --- a/src/ui_interface.rs +++ b/src/ui_interface.rs @@ -69,7 +69,7 @@ pub fn goto_install() { allow_err!(crate::run_me(vec!["--install"])); } -pub fn install_me(_options: String, _path: String, silent: bool, debug: bool) { +pub fn install_me(_options: String, _path: String, _silent: bool, _debug: bool) { #[cfg(windows)] std::thread::spawn(move || { allow_err!(crate::platform::windows::install_me( @@ -682,6 +682,7 @@ pub fn check_super_user_permission() -> bool { true } +#[allow(dead_code)] pub fn check_zombie(childs: Childs) { let mut deads = Vec::new(); loop { diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs index d0142333d..3c6c21c3f 100644 --- a/src/ui_session_interface.rs +++ b/src/ui_session_interface.rs @@ -8,7 +8,6 @@ use crate::client::{ }; use crate::{client::Data, client::Interface}; use async_trait::async_trait; -use std::io::Read; use hbb_common::config::{Config, LocalConfig, PeerConfig}; use hbb_common::rendezvous_proto::ConnType; use hbb_common::tokio::{self, sync::mpsc}; @@ -1157,7 +1156,7 @@ impl Session { return; } log::info!("keyboard hooked"); - let mut me = self.clone(); + let me = self.clone(); #[cfg(windows)] crate::platform::windows::enable_lowlevel_keyboard(std::ptr::null_mut() as _); std::thread::spawn(move || {