Skip to content

Commit bbd3d7b

Browse files
thetechnickerthetechnicker
committed
clippy
1 parent c185f30 commit bbd3d7b

File tree

7 files changed

+47
-53
lines changed

7 files changed

+47
-53
lines changed

‎console-chat/src/app.rs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,8 @@ impl App {
9999
log::trace!("Handling Event: {event:?}");
100100
match event {
101101
Event::Tick => self.tick(),
102-
Event::Crossterm(event) => match event {
103-
CrosstermEvent::Resize(_, _) => {
104-
terminal.draw(|frame| self.render(frame))?;
105-
}
106-
_ => {}
102+
Event::Crossterm(event) => if let CrosstermEvent::Resize(_, _) = event {
103+
terminal.draw(|frame| self.render(frame))?;
107104
},
108105
Event::App(app_event) => {
109106
match app_event {
@@ -117,11 +114,10 @@ impl App {
117114
self.handle_network_error(e);
118115
}
119116
AppEvent::NetworkEvent(network::NetworkEvent::RequestReconnect) => {
120-
if self.current_screen == screens::CurrentScreen::Chat {
121-
if let Err(e) = self.api.listen_reconnect().await {
117+
if self.current_screen == screens::CurrentScreen::Chat
118+
&& let Err(e) = self.api.listen_reconnect().await {
122119
self.handle_network_error(e)
123120
}
124-
}
125121
}
126122
AppEvent::SendMessage(msg) => {
127123
log::debug!("Sending: {}", msg);
@@ -178,12 +174,11 @@ impl App {
178174
AppEvent::KeyEvent(k) if self.error_box.is_some() => {
179175
if k.is_press() {
180176
let mut reset_err_box = false;
181-
if let Some(err) = self.error_box.as_ref() {
182-
if err.creation.elapsed() > std::time::Duration::from_millis(20)
177+
if let Some(err) = self.error_box.as_ref()
178+
&& err.creation.elapsed() > std::time::Duration::from_millis(20)
183179
{
184180
reset_err_box = true;
185181
}
186-
}
187182
if reset_err_box {
188183
self.error_box = None
189184
}
@@ -325,11 +320,10 @@ impl App {
325320
// Popup
326321
{
327322
let mut del_error_box = false;
328-
if let Some(e) = self.error_box.as_mut() {
329-
if e.creation.elapsed() > e.timeout {
323+
if let Some(e) = self.error_box.as_mut()
324+
&& e.creation.elapsed() > e.timeout {
330325
del_error_box = true;
331326
}
332-
}
333327
if del_error_box {
334328
self.error_box = None;
335329
if let Some(e) = self.error_qeue.pop() {

‎console-chat/src/event.rs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ pub struct EventHandler {
8282
handle: tokio::task::JoinHandle<Result<(), color_eyre::eyre::Error>>,
8383
}
8484

85+
impl Default for EventHandler {
86+
fn default() -> Self {
87+
Self::new()
88+
}
89+
}
90+
8591
impl EventHandler {
8692
/// Constructs a new instance of [`EventHandler`] and spawns a new thread to handle events.
8793
pub fn new() -> Self {
@@ -145,15 +151,15 @@ impl EventSender {
145151
let _ = self.sender.send(event);
146152
}
147153
}
148-
impl Into<AppEventSender> for EventSender {
149-
fn into(self) -> AppEventSender {
150-
AppEventSender::new(self.sender)
154+
impl From<EventSender> for AppEventSender {
155+
fn from(val: EventSender) -> Self {
156+
AppEventSender::new(val.sender)
151157
}
152158
}
153159

154-
impl Into<NetworkEventSender> for EventSender {
155-
fn into(self) -> NetworkEventSender {
156-
NetworkEventSender::new(self.sender)
160+
impl From<EventSender> for NetworkEventSender {
161+
fn from(val: EventSender) -> Self {
162+
NetworkEventSender::new(val.sender)
157163
}
158164
}
159165

@@ -253,8 +259,8 @@ impl EventTask {
253259
fn handle_key_events(key_event: KeyEvent) -> Event {
254260
match key_event.code {
255261
KeyCode::Char('c' | 'C') if key_event.modifiers == KeyModifiers::CONTROL => {
256-
return Event::App(AppEvent::Quit);
262+
Event::App(AppEvent::Quit)
257263
}
258-
_ => return Event::App(AppEvent::KeyEvent(key_event)),
264+
_ => Event::App(AppEvent::KeyEvent(key_event)),
259265
}
260266
}

‎console-chat/src/network/client.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl ApiClient {
8383
"You haven't joined a room yet".to_owned(),
8484
))
8585
},
86-
|t| Ok(t),
86+
Ok,
8787
)?;
8888
let url = self.base_url.join(&format!("room/{room}"))?;
8989
let body = serde_json::json!(args);
@@ -143,10 +143,11 @@ impl ApiClient {
143143
match chunk {
144144
Err(e) => local_sender.send(NetworkEvent::Error(e.into())),
145145
Ok(data) => match str::from_utf8(&data) {
146-
Ok(s) => match serde_json::from_str::<user::ServerMessage>(s) {
147-
Ok(msg) => local_sender.send(NetworkEvent::Message(msg)),
148-
Err(_) => {} //local_sender.send(NetworkEvent::Error(e.into())),
149-
},
146+
Ok(s) => {
147+
if let Ok(msg) = serde_json::from_str::<user::ServerMessage>(s) {
148+
local_sender.send(NetworkEvent::Message(msg))
149+
}
150+
}
150151
Err(e) => local_sender.send(NetworkEvent::Error(e.into())),
151152
},
152153
}
@@ -181,8 +182,9 @@ pub async fn handle_errors_raw(resp: reqwest::Response) -> Result<reqwest::Respo
181182
}
182183
}
183184

185+
#[allow(unused_lifetimes)]
184186
#[inline]
185-
pub async fn handle_errors_json<'de, T>(resp: reqwest::Response) -> Result<T, ApiError>
187+
pub async fn handle_errors_json<'a, T>(resp: reqwest::Response) -> Result<T, ApiError>
186188
where
187189
T: serde::de::DeserializeOwned,
188190
{

‎console-chat/src/network/error.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl Clone for ApiError {
3636
fn clone(&self) -> Self {
3737
match self {
3838
Self::GenericError(e) => Self::GenericError(e.clone()),
39-
Self::UrlParseError(e) => Self::UrlParseError(e.clone()),
39+
Self::UrlParseError(e) => Self::UrlParseError(*e),
4040

4141
Self::ReqwestError(e) => Self::ReqwestError(Arc::clone(e)),
4242
//Self::ReqwestErrorClone(e) => Self::ReqwestErrorClone(e.clone()),
@@ -46,7 +46,7 @@ impl Clone for ApiError {
4646
Self::ServerError(e) => Self::ServerError(e.clone()),
4747
Self::ClientError(e) => Self::ClientError(e.clone()),
4848

49-
Self::Utf8Error(e) => Self::Utf8Error(e.clone()),
49+
Self::Utf8Error(e) => Self::Utf8Error(*e),
5050
Self::SerdeError(e) => Self::SerdeError(Arc::clone(e)),
5151
}
5252
}

‎console-chat/src/screens/chat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl Screen for ChatScreen {
111111
if !input.is_empty() {
112112
let msg = input.clone();
113113
self.event_sender
114-
.send(AppEvent::SendMessage(String::from(msg.trim().to_owned())));
114+
.send(AppEvent::SendMessage(msg.trim().to_owned()));
115115
self.send_current_widget_event(AppEvent::Clear(true));
116116
self.send_current_widget_event(AppEvent::Focus);
117117
}
@@ -185,7 +185,7 @@ impl From<&user::ServerMessage> for ListItem<'_> {
185185
let content = format!("{}: {}", user_display, item.base.text);
186186

187187
// Create ListItem from single Spans line
188-
ListItem::new(Span::from(Span::raw(content)))
188+
ListItem::new(Span::raw(content))
189189
}
190190
}
191191
const fn alternate_colors(i: usize) -> Color {

‎console-chat/src/screens/login.rs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,13 @@ impl Screen for LoginScreen {
171171

172172
if let Some(x) = u_x {
173173
Some(CursorPos {
174-
x: x + user_input.x as u16,
175-
y: user_input.y + 1 as u16,
174+
x: x + user_input.x,
175+
y: user_input.y + 1_u16,
176176
})
177-
} else if let Some(x) = p_x {
178-
Some(CursorPos {
179-
x: x + pwd_input.x as u16,
180-
y: pwd_input.y + 1 as u16,
181-
})
182-
} else {
183-
None
184-
}
177+
} else { p_x.map(|x| CursorPos {
178+
x: x + pwd_input.x,
179+
y: pwd_input.y + 1_u16,
180+
}) }
185181
}
186182

187183
fn get_data(&self) -> serde_json::Value {

‎console-chat/src/widgets/input.rs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,9 @@ impl Widget for InputWidget {
8585
AppEvent::NoFocus => self.stop_editing(),
8686
AppEvent::Focus => self.start_editing(),
8787
AppEvent::KeyEvent(key) => match self.input_mode {
88-
InputMode::Normal => match key.code {
89-
_ => {}
90-
},
91-
InputMode::Editing => match key.code {
92-
_ => {
93-
self.input.handle_event(&Event::Key(key));
94-
}
88+
InputMode::Normal => {},
89+
InputMode::Editing => {
90+
self.input.handle_event(&Event::Key(key));
9591
},
9692
},
9793
_ => {}
@@ -106,16 +102,16 @@ impl Widget for InputWidget {
106102
let width = area.width.max(3) - 3;
107103
let scroll = self.input.visual_scroll(width as usize);
108104
let value = self.input.value();
109-
let [content, title] = if value.len() > 0 {
105+
let [content, title] = if !value.is_empty() {
110106
match self.input_type {
111107
InputType::Password => [
112-
format!("{}", "*".repeat(self.input.value().len())),
108+
"*".repeat(self.input.value().len()).to_string(),
113109
self.titel.clone(),
114110
],
115-
_ => [format!("{}", self.input.value()), self.titel.clone()],
111+
_ => [self.input.value().to_string(), self.titel.clone()],
116112
}
117113
} else {
118-
[String::from(self.titel.clone()), String::from("")]
114+
[self.titel.clone(), String::from("")]
119115
};
120116

121117
let input_elem = Paragraph::new(content)

0 commit comments

Comments
 (0)