liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

lints

Browse Source
This commit is contained in:
John Smith
2021-11-27 21:31:01 -05:00
parent ea8c75a29f
commit 1cecacd8fd
13 changed files with 50 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veilid-cli/src/client_api_connection.rs
View File

@@ -16,7 +16,7 @@ struct VeilidClientImpl {
impl VeilidClientImpl {
pub fn new(comproc: CommandProcessor) -> Self {
Self { comproc: comproc }
Self { comproc }
}
}
@@ -64,7 +64,7 @@ impl ClientApiConnection {
pub fn new(comproc: CommandProcessor) -> Self {
Self {
inner: Rc::new(RefCell::new(ClientApiConnectionInner {
comproc: comproc,
comproc,
connect_addr: None,
disconnector: None,
server: None,
@@ -75,9 +75,9 @@ impl ClientApiConnection {
async fn handle_connection(&mut self) -> Result<()> {
trace!("ClientApiConnection::handle_connection");
let connect_addr = self.inner.borrow().connect_addr.unwrap().clone();
let connect_addr = self.inner.borrow().connect_addr.unwrap();
// Connect the TCP socket
let stream = async_std::net::TcpStream::connect(connect_addr.clone()).await?;
let stream = async_std::net::TcpStream::connect(connect_addr).await?;
// If it succeed, disable nagle algorithm
stream.set_nodelay(true)?;

14
veilid-cli/src/command_processor.rs
View File

@@ -59,7 +59,7 @@ impl CommandProcessor {
pub fn new(ui: UI, settings: &Settings) -> Self {
Self {
inner: Rc::new(RefCell::new(CommandProcessorInner {
ui: ui,
ui,
capi: None,
reconnect: settings.autoreconnect,
finished: false,
@@ -205,7 +205,7 @@ detach - detach the server from the Veilid network
// Loop while we want to keep the connection
let mut first = true;
while self.inner().reconnect {
let server_addr_opt = self.inner_mut().server_addr.clone();
let server_addr_opt = self.inner_mut().server_addr;
let server_addr = match server_addr_opt {
None => break,
Some(addr) => addr,
@@ -213,15 +213,15 @@ detach - detach the server from the Veilid network
if first {
info!("Connecting to server at {}", server_addr);
self.set_connection_state(ConnectionState::Retrying(
server_addr.clone(),
server_addr,
SystemTime::now(),
));
} else {
debug!("Retrying connection to {}", server_addr);
}
let mut capi = self.capi();
let res = capi.connect(server_addr.clone()).await;
if let Ok(_) = res {
let res = capi.connect(server_addr).await;
if res.is_ok() {
info!(
"Connection to server at {} terminated normally",
server_addr
@@ -234,7 +234,7 @@ detach - detach the server from the Veilid network
}
self.set_connection_state(ConnectionState::Retrying(
server_addr.clone(),
server_addr,
SystemTime::now(),
));
@@ -260,7 +260,7 @@ detach - detach the server from the Veilid network
self.inner_mut().server_addr = server_addr;
}
pub fn get_server_address(&self) -> Option<SocketAddr> {
self.inner().server_addr.clone()
self.inner().server_addr
}
// called by client_api_connection
// calls into ui

2
veilid-cli/src/main.rs
View File

@@ -70,7 +70,7 @@ async fn main() -> Result<()> {
matches.occurrences_of("config-file") == 0,
matches.value_of_os("config-file").unwrap(),
)
.map_err(|x| Box::new(x))?;
.map_err(Box::new)?;
// Set config from command line
if matches.occurrences_of("debug") != 0 {

8
veilid-cli/src/settings.rs
View File

@@ -1,7 +1,7 @@
use config;
use directories::*;
use log;
use serde;
use serde_derive::*;
use std::ffi::OsStr;
use std::net::{SocketAddr, ToSocketAddrs};
@@ -118,7 +118,7 @@ impl<'de> serde::Deserialize<'de> for NamedSocketAddrs {
let s = String::deserialize(deserializer)?;
let addr_iter = s
.to_socket_addrs()
.map_err(|x| serde::de::Error::custom(x))?;
.map_err(serde::de::Error::custom)?;
Ok(NamedSocketAddrs {
name: s,
addrs: addr_iter.collect(),

21
veilid-cli/src/ui.rs
View File

@@ -26,7 +26,7 @@ struct Dirty<T> {
impl<T> Dirty<T> {
pub fn new(value: T) -> Self {
Self {
value: value,
value,
dirty: true,
}
}
@@ -122,7 +122,7 @@ impl UI {
cmd_history_position: 0,
cmd_history_max_size: settings.interface.command_line.history_size,
connection_dialog_state: None,
cb_sink: cb_sink,
cb_sink,
})),
};
@@ -203,7 +203,7 @@ impl UI {
siv.add_fullscreen_layer(mainlayout);
UI::setup_colors(&mut siv, &mut inner, &settings);
UI::setup_colors(&mut siv, &mut inner, settings);
UI::setup_quit_handler(&mut siv);
drop(inner);
@@ -347,7 +347,7 @@ impl UI {
}
pub fn add_node_event(&mut self, event: &str) {
let inner = self.inner.borrow_mut();
let color = inner.log_colors.get(&Level::Info).unwrap().clone();
let color = *inner.log_colors.get(&Level::Info).unwrap();
for line in event.lines() {
cursive_flexi_logger_view::push_to_log(StyledString::styled(line, color));
}
@@ -470,11 +470,10 @@ impl UI {
match Self::run_command(s, text) {
Ok(_) => {}
Err(e) => {
let color = Self::inner_mut(s)
let color = *Self::inner_mut(s)
.log_colors
.get(&Level::Error)
.unwrap()
.clone();
.unwrap();
cursive_flexi_logger_view::push_to_log(StyledString::styled(
format!("> {}", text),
@@ -668,7 +667,7 @@ impl UI {
return true;
}
return false;
false
}
fn refresh_connection_dialog(s: &mut Cursive) {
@@ -686,13 +685,13 @@ impl UI {
};
debug!("address is {}", addr);
let mut edit = s.find_name::<EditView>("connection-address").unwrap();
edit.set_content(addr.to_string());
edit.set_content(addr);
edit.set_enabled(true);
let mut dlg = s.find_name::<Dialog>("connection-dialog").unwrap();
dlg.add_button("Connect", Self::submit_connection_address);
}
ConnectionState::Connected(_, _) => {
return;
}
ConnectionState::Retrying(addr, _) => {
//
@@ -717,7 +716,7 @@ impl UI {
match inner.ui_state.connection_state.get() {
ConnectionState::Disconnected => {
status.append_styled(format!("Disconnected "), ColorStyle::highlight_inactive());
status.append_styled("Disconnected ".to_string(), ColorStyle::highlight_inactive());
status.append_styled("|", ColorStyle::highlight_inactive());
}
ConnectionState::Retrying(addr, _) => {