From ea7815535c8e437852bbf1cdba88d61534b1be03 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Wed, 10 Apr 2024 17:40:51 +0200 Subject: [PATCH] Fix clippy issues --- src/command_utils/events.rs | 2 +- src/parameter.rs | 8 ++++---- src/response.rs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/command_utils/events.rs b/src/command_utils/events.rs index 00ccaca..8e3e585 100644 --- a/src/command_utils/events.rs +++ b/src/command_utils/events.rs @@ -15,7 +15,7 @@ pub fn register_events(connection: &mut Telnet, events: Vec) -> Resul pub fn handle_event_response(connection: &mut Telnet, response: Response, known_clients: &mut Vec) { if let Response::Event(event_type, params) = response { - let event = Event::new(connection, event_type, params, &known_clients); + let event = Event::new(connection, event_type, params, known_clients); match serde_json::to_string(&event) { Ok(json) => println!("{}", json), Err(err) => { diff --git a/src/parameter.rs b/src/parameter.rs index 206412b..b2476a0 100644 --- a/src/parameter.rs +++ b/src/parameter.rs @@ -5,7 +5,7 @@ pub type ParameterList = HashMap; pub type Parameter = (String, String); pub fn parameter_find(params: &ParameterList, name: &str) -> Option { - params.get(name).map(|value| value.clone()) + params.get(name).cloned() } pub fn parameter_list_has(params: &ParameterList, key: &str, value: &str, strict: bool) -> bool { @@ -17,7 +17,7 @@ pub fn parameter_list_has(params: &ParameterList, key: &str, value: &str, strict return true; } } - return false; + false } pub fn parameter_list_find(param_lists: &Vec, key: &str, value: &str, strict: bool) -> Option { @@ -58,7 +58,7 @@ pub fn parameter_to_string(param: Parameter) -> String { pub fn parameter_list_to_string(parameter_list: ParameterList, sep: &str) -> String { parameter_list .into_iter() - .map(|param| parameter_to_string(param)) + .map(parameter_to_string) .collect::>() .join(sep) } @@ -66,7 +66,7 @@ pub fn parameter_list_to_string(parameter_list: ParameterList, sep: &str) -> Str pub fn parameters_to_string(parameters: Vec, sep: &str) -> String { parameters .into_iter() - .map(|param| parameter_to_string(param)) + .map(parameter_to_string) .collect::>() .join(sep) } \ No newline at end of file diff --git a/src/response.rs b/src/response.rs index aed60d2..7901fa5 100644 --- a/src/response.rs +++ b/src/response.rs @@ -45,7 +45,7 @@ fn get_response_type(type_str: &str) -> Result { return Ok(ResponseType::Event(event_type)); } - return Ok(ResponseType::Unknown); + Ok(ResponseType::Unknown) } impl TryFrom for Response { @@ -54,7 +54,7 @@ impl TryFrom for Response { fn try_from(response_str: String) -> Result { let response_str = response_str.trim_end_matches("\n\r"); - let (rsp_type, rsp_params) = split_type_and_params(&response_str) + let (rsp_type, rsp_params) = split_type_and_params(response_str) .map_err(|err| ResponseError { id: -1, msg: err, @@ -66,7 +66,7 @@ impl TryFrom for Response { parameter_lists.push(response_params); } - return match rsp_type { + match rsp_type { ResponseType::Error => { Err(ResponseError::create_error(¶meter_lists[0])) }