From a19b86aeb6229e7546ca9b56c2b56e9736635a0a Mon Sep 17 00:00:00 2001 From: gtema Date: Mon, 11 Aug 2025 14:21:49 +0000 Subject: [PATCH] chore: Address some 1.89 clippy warnings --- openstack_sdk/src/api/find.rs | 3 +- openstack_sdk/src/api/rest_endpoint.rs | 2 +- openstack_sdk/src/auth/auth_token_endpoint.rs | 2 +- openstack_tui/src/app.rs | 99 +++++++++---------- .../src/components/cloud_select_popup.rs | 8 +- .../compute/server_instance_action_events.rs | 14 ++- .../compute/server_instance_actions.rs | 8 +- openstack_tui/src/components/header.rs | 24 ++--- openstack_tui/src/components/home.rs | 46 ++++----- .../identity/application_credentials.rs | 8 +- .../src/components/identity/group_users.rs | 8 +- .../src/components/identity/users.rs | 14 +-- .../components/load_balancer/pool_members.rs | 8 +- .../src/components/project_select_popup.rs | 30 +++--- .../src/components/resource_select_popup.rs | 19 ++-- openstack_tui/src/components/table_view.rs | 34 +++---- 16 files changed, 159 insertions(+), 168 deletions(-) diff --git a/openstack_sdk/src/api/find.rs b/openstack_sdk/src/api/find.rs index ecf8e4e33..46b1ed239 100644 --- a/openstack_sdk/src/api/find.rs +++ b/openstack_sdk/src/api/find.rs @@ -280,7 +280,6 @@ mod tests { fn method(&self) -> http::Method { http::Method::GET } - fn endpoint(&self) -> Cow<'static, str> { "dummies".into() } @@ -290,7 +289,7 @@ mod tests { fn response_key(&self) -> Option> { Some("resources".into()) } - fn parameters(&self) -> QueryParams { + fn parameters(&self) -> QueryParams<'_> { let mut params = QueryParams::default(); params.push_opt("name", self.name.as_ref()); diff --git a/openstack_sdk/src/api/rest_endpoint.rs b/openstack_sdk/src/api/rest_endpoint.rs index f3ca9fe63..26493455e 100644 --- a/openstack_sdk/src/api/rest_endpoint.rs +++ b/openstack_sdk/src/api/rest_endpoint.rs @@ -51,7 +51,7 @@ pub trait RestEndpoint { fn service_type(&self) -> ServiceType; /// Query parameters for the endpoint. - fn parameters(&self) -> QueryParams { + fn parameters(&self) -> QueryParams<'_> { QueryParams::default() } diff --git a/openstack_sdk/src/auth/auth_token_endpoint.rs b/openstack_sdk/src/auth/auth_token_endpoint.rs index 67e34aea9..4ef87b301 100644 --- a/openstack_sdk/src/auth/auth_token_endpoint.rs +++ b/openstack_sdk/src/auth/auth_token_endpoint.rs @@ -340,7 +340,7 @@ impl RestEndpoint for Request<'_> { "auth/tokens".to_string().into() } - fn parameters(&self) -> QueryParams { + fn parameters(&self) -> QueryParams<'_> { QueryParams::default() } diff --git a/openstack_tui/src/app.rs b/openstack_tui/src/app.rs index 38d0b0bd5..ff66fbb2c 100644 --- a/openstack_tui/src/app.rs +++ b/openstack_tui/src/app.rs @@ -303,15 +303,15 @@ impl App { _ => {} } if let Some(popup_type) = &self.active_popup { - if let Some(popup) = self.popups.get_mut(popup_type) { - if let Some(action) = popup.handle_events(Some(event.clone()))? { - action_tx.send(action)?; - } - } - } else if let Some(component) = self.components.get_mut(&self.mode) { - if let Some(action) = component.handle_events(Some(event.clone()))? { + if let Some(popup) = self.popups.get_mut(popup_type) + && let Some(action) = popup.handle_events(Some(event.clone()))? + { action_tx.send(action)?; } + } else if let Some(component) = self.components.get_mut(&self.mode) + && let Some(action) = component.handle_events(Some(event.clone()))? + { + action_tx.send(action)?; } if let Some(action) = self.header.handle_events(Some(event.clone()))? { action_tx.send(action)?; @@ -332,10 +332,10 @@ impl App { } else if key == KeyEvent::new(KeyCode::Char('c'), KeyModifiers::CONTROL) { action_tx.send(Action::Quit)?; } else if key.code == KeyCode::Esc && self.active_popup.is_some() { - if let Some(popup_type) = &self.active_popup { - if let Some(popup) = self.popups.get_mut(popup_type) { - popup.handle_key_events(key)?; - } + if let Some(popup_type) = &self.active_popup + && let Some(popup) = self.popups.get_mut(popup_type) + { + popup.handle_key_events(key)?; } // Close the popup self.active_popup = None; @@ -403,21 +403,21 @@ impl App { } Action::ConnectedToCloud(_) => { - if let Some(popup) = &self.active_popup { - if popup == &Popup::SwitchProject { - // Hide popup - self.active_popup = None; - } + if let Some(popup) = &self.active_popup + && popup == &Popup::SwitchProject + { + // Hide popup + self.active_popup = None; } self.cloud_connected = true; self.render(tui)?; } Action::CloudChangeScope(ref scope) => { - if let Some(popup) = &self.active_popup { - if popup == &Popup::SwitchProject { - // Hide popup - self.active_popup = None; - } + if let Some(popup) = &self.active_popup + && popup == &Popup::SwitchProject + { + // Hide popup + self.active_popup = None; } self.render(tui)?; self.cloud_worker_tx @@ -551,39 +551,36 @@ impl App { .as_ref(), ) .split(f.area()); - if draw_header { - if let Err(e) = self.header.draw(f, rects[0]) { - self.action_tx - .send(Action::Error { - msg: format!("Failed to draw: {e:?}"), - action: None, - }) - .unwrap(); - } + if draw_header && let Err(e) = self.header.draw(f, rects[0]) { + self.action_tx + .send(Action::Error { + msg: format!("Failed to draw: {e:?}"), + action: None, + }) + .unwrap(); } - if let Some(component) = self.components.get_mut(&self.mode) { - if let Err(e) = component.draw(f, rects[1]) { - error!("Error {:?}", e); - self.action_tx - .send(Action::Error { - msg: format!("Failed to draw: {e:?}"), - action: None, - }) - .unwrap(); - } + if let Some(component) = self.components.get_mut(&self.mode) + && let Err(e) = component.draw(f, rects[1]) + { + error!("Error {:?}", e); + self.action_tx + .send(Action::Error { + msg: format!("Failed to draw: {e:?}"), + action: None, + }) + .unwrap(); } - if let Some(popup_type) = &self.active_popup { - if let Some(popup) = self.popups.get_mut(popup_type) { - if let Err(e) = popup.draw(f, f.area()) { - self.action_tx - .send(Action::Error { - msg: format!("Failed to draw: {e:?}"), - action: None, - }) - .unwrap(); - } - } + if let Some(popup_type) = &self.active_popup + && let Some(popup) = self.popups.get_mut(popup_type) + && let Err(e) = popup.draw(f, f.area()) + { + self.action_tx + .send(Action::Error { + msg: format!("Failed to draw: {e:?}"), + action: None, + }) + .unwrap(); } })?; Ok(()) diff --git a/openstack_tui/src/components/cloud_select_popup.rs b/openstack_tui/src/components/cloud_select_popup.rs index 2601e2fe6..4313fac69 100644 --- a/openstack_tui/src/components/cloud_select_popup.rs +++ b/openstack_tui/src/components/cloud_select_popup.rs @@ -66,10 +66,10 @@ impl Component for CloudSelect { fn handle_key_events(&mut self, key: KeyEvent) -> Result, TuiError> { self.fuzzy_list.handle_key_events(key)?; - if key.code == KeyCode::Enter { - if let Some(cloud) = self.fuzzy_list.selected() { - return Ok(Some(Action::ConnectToCloud(cloud.clone()))); - } + if key.code == KeyCode::Enter + && let Some(cloud) = self.fuzzy_list.selected() + { + return Ok(Some(Action::ConnectToCloud(cloud.clone()))); } Ok(None) } diff --git a/openstack_tui/src/components/compute/server_instance_action_events.rs b/openstack_tui/src/components/compute/server_instance_action_events.rs index 97ba9e680..46117d1ec 100644 --- a/openstack_tui/src/components/compute/server_instance_action_events.rs +++ b/openstack_tui/src/components/compute/server_instance_action_events.rs @@ -118,14 +118,12 @@ impl Component for ComputeServerInstanceActionEvents<'_> { request: ApiRequest::Compute(ComputeApiRequest::Server(req)), data, } => { - if let ComputeServerApiRequest::InstanceAction(x) = *req { - if let ComputeServerInstanceActionApiRequest::Get(_) = *x { - if let Some(events) = data.get("events") { - if let Some(ar) = events.as_array() { - self.set_data(ar.to_vec())?; - } - } - } + if let ComputeServerApiRequest::InstanceAction(x) = *req + && let ComputeServerInstanceActionApiRequest::Get(_) = *x + && let Some(events) = data.get("events") + && let Some(ar) = events.as_array() + { + self.set_data(ar.to_vec())?; } } Action::SetComputeServerInstanceActionShowFilters(req) => { diff --git a/openstack_tui/src/components/compute/server_instance_actions.rs b/openstack_tui/src/components/compute/server_instance_actions.rs index 659dd4f87..6eb1a2b04 100644 --- a/openstack_tui/src/components/compute/server_instance_actions.rs +++ b/openstack_tui/src/components/compute/server_instance_actions.rs @@ -89,10 +89,10 @@ impl Component for ComputeServerInstanceActions<'_> { request: ApiRequest::Compute(ComputeApiRequest::Server(req)), data, } => { - if let ComputeServerApiRequest::InstanceAction(x) = *req { - if let ComputeServerInstanceActionApiRequest::List(_) = *x { - self.set_data(data)?; - } + if let ComputeServerApiRequest::InstanceAction(x) = *req + && let ComputeServerInstanceActionApiRequest::List(_) = *x + { + self.set_data(data)?; } } Action::SetComputeServerInstanceActionListFilters(filters) => { diff --git a/openstack_tui/src/components/header.rs b/openstack_tui/src/components/header.rs index 240e1f2ac..01c883933 100644 --- a/openstack_tui/src/components/header.rs +++ b/openstack_tui/src/components/header.rs @@ -192,24 +192,24 @@ impl Component for Header { self.connection_data_rows .push((String::from("Cloud:"), self.cloud_name.clone())); if let Some(project) = &auth_token.project { - if let Some(domain) = &project.domain { - if let Some(name) = &domain.name { - self.domain_name = name.clone(); - self.connection_data_rows - .push((String::from("Domain:"), self.domain_name.clone())); - } + if let Some(domain) = &project.domain + && let Some(name) = &domain.name + { + self.domain_name = name.clone(); + self.connection_data_rows + .push((String::from("Domain:"), self.domain_name.clone())); } if let Some(name) = &project.name { self.project_name = name.clone(); self.connection_data_rows .push((String::from("Project:"), self.project_name.clone())); } - } else if let Some(domain) = &auth_token.domain { - if let Some(name) = &domain.name { - self.domain_name = name.clone(); - self.connection_data_rows - .push((String::from("Domain:"), self.domain_name.clone())); - } + } else if let Some(domain) = &auth_token.domain + && let Some(name) = &domain.name + { + self.domain_name = name.clone(); + self.connection_data_rows + .push((String::from("Domain:"), self.domain_name.clone())); } } _ => {} diff --git a/openstack_tui/src/components/home.rs b/openstack_tui/src/components/home.rs index 6b239fad1..e45a873e0 100644 --- a/openstack_tui/src/components/home.rs +++ b/openstack_tui/src/components/home.rs @@ -106,25 +106,25 @@ impl Home { } fn refresh_data(&mut self) -> Result, TuiError> { - if let Some(command_tx) = &self.command_tx { - if let Some(project_id) = &self.project_id { - command_tx.send(Action::PerformApiRequest(ApiRequest::from( - ComputeQuotaSetApiRequest::Details(Box::new( - ComputeQuotaSetShowBuilder::default() - .id(project_id.clone()) - .build() - .wrap_err("cannot prepare compute quota request")?, - )), - )))?; - command_tx.send(Action::PerformApiRequest(ApiRequest::from( - NetworkQuotaApiRequest::Details(Box::new( - NetworkQuotaShowBuilder::default() - .id(project_id.clone()) - .build() - .wrap_err("cannot prepare network quota request")?, - )), - )))?; - } + if let Some(command_tx) = &self.command_tx + && let Some(project_id) = &self.project_id + { + command_tx.send(Action::PerformApiRequest(ApiRequest::from( + ComputeQuotaSetApiRequest::Details(Box::new( + ComputeQuotaSetShowBuilder::default() + .id(project_id.clone()) + .build() + .wrap_err("cannot prepare compute quota request")?, + )), + )))?; + command_tx.send(Action::PerformApiRequest(ApiRequest::from( + NetworkQuotaApiRequest::Details(Box::new( + NetworkQuotaShowBuilder::default() + .id(project_id.clone()) + .build() + .wrap_err("cannot prepare network quota request")?, + )), + )))?; } Ok(None) } @@ -152,10 +152,10 @@ impl Component for Home { self.set_loading(true); self.compute_quota = None; self.network_quota = None; - if let Some(project) = auth.project { - if let Some(pid) = project.id { - self.project_id = Some(pid); - } + if let Some(project) = auth.project + && let Some(pid) = project.id + { + self.project_id = Some(pid); } if current_mode == Mode::Home { diff --git a/openstack_tui/src/components/identity/application_credentials.rs b/openstack_tui/src/components/identity/application_credentials.rs index 27598d9dd..e1cc705dc 100644 --- a/openstack_tui/src/components/identity/application_credentials.rs +++ b/openstack_tui/src/components/identity/application_credentials.rs @@ -100,10 +100,10 @@ impl Component for IdentityApplicationCredentials<'_> { request: ApiRequest::Identity(IdentityApiRequest::User(req)), data, } => { - if let IdentityUserApiRequest::ApplicationCredential(x) = *req { - if let IdentityUserApplicationCredentialApiRequest::List(_) = *x { - self.set_data(data)?; - } + if let IdentityUserApiRequest::ApplicationCredential(x) = *req + && let IdentityUserApplicationCredentialApiRequest::List(_) = *x + { + self.set_data(data)?; } } _ => {} diff --git a/openstack_tui/src/components/identity/group_users.rs b/openstack_tui/src/components/identity/group_users.rs index a3c8c018f..2db41a029 100644 --- a/openstack_tui/src/components/identity/group_users.rs +++ b/openstack_tui/src/components/identity/group_users.rs @@ -92,10 +92,10 @@ impl Component for IdentityGroupUsers<'_> { request: ApiRequest::Identity(IdentityApiRequest::Group(req)), data, } => { - if let IdentityGroupApiRequest::User(x) = *req { - if let IdentityGroupUserApiRequest::List(_) = *x { - self.set_data(data)?; - } + if let IdentityGroupApiRequest::User(x) = *req + && let IdentityGroupUserApiRequest::List(_) = *x + { + self.set_data(data)?; } } _ => {} diff --git a/openstack_tui/src/components/identity/users.rs b/openstack_tui/src/components/identity/users.rs index b47caedd4..79a1814b9 100644 --- a/openstack_tui/src/components/identity/users.rs +++ b/openstack_tui/src/components/identity/users.rs @@ -185,14 +185,14 @@ impl Component for IdentityUsers<'_> { self.sync_table_data()?; } self.set_loading(false); - } else if let IdentityUserApiRequest::Delete(del) = *req { - if let IdentityUserDelete { id, .. } = *del { - if self.delete_item_row_by_res_id_mut(&id)?.is_none() { - return Ok(Some(Action::Refresh)); - } - self.sync_table_data()?; - self.set_loading(false); + } else if let IdentityUserApiRequest::Delete(del) = *req + && let IdentityUserDelete { id, .. } = *del + { + if self.delete_item_row_by_res_id_mut(&id)?.is_none() { + return Ok(Some(Action::Refresh)); } + self.sync_table_data()?; + self.set_loading(false); } } _ => {} diff --git a/openstack_tui/src/components/load_balancer/pool_members.rs b/openstack_tui/src/components/load_balancer/pool_members.rs index dd9dab366..24478c184 100644 --- a/openstack_tui/src/components/load_balancer/pool_members.rs +++ b/openstack_tui/src/components/load_balancer/pool_members.rs @@ -87,10 +87,10 @@ impl Component for LoadBalancerPoolMembers<'_> { request: ApiRequest::LoadBalancer(LoadBalancerApiRequest::Pool(res)), data, } => { - if let LoadBalancerPoolApiRequest::Member(x) = *res { - if let LoadBalancerPoolMemberApiRequest::List(_) = *x { - self.set_data(data)?; - } + if let LoadBalancerPoolApiRequest::Member(x) = *res + && let LoadBalancerPoolMemberApiRequest::List(_) = *x + { + self.set_data(data)?; } } Action::SetLoadBalancerPoolMemberListFilters(filters) => { diff --git a/openstack_tui/src/components/project_select_popup.rs b/openstack_tui/src/components/project_select_popup.rs index ff2ff4ccd..82f01b22e 100644 --- a/openstack_tui/src/components/project_select_popup.rs +++ b/openstack_tui/src/components/project_select_popup.rs @@ -123,22 +123,20 @@ impl Component for ProjectSelect { fn handle_key_events(&mut self, key: KeyEvent) -> Result, TuiError> { self.fuzzy_list.handle_key_events(key)?; - if key.code == KeyCode::Enter { - if let Some(selected) = self.fuzzy_list.selected() { - if let Some(project) = self.items.iter().find(|item| item.name == *selected) { - let new_project = openstack_sdk::types::identity::v3::Project { - id: Some(project.id.clone()), - name: Some(project.name.clone()), - domain: Some(openstack_sdk::types::identity::v3::Domain { - id: Some(project.domain_id.clone()), - name: None, - }), - }; - let new_scope = - openstack_sdk::auth::authtoken::AuthTokenScope::Project(new_project); - return Ok(Some(Action::CloudChangeScope(new_scope))); - } - } + if key.code == KeyCode::Enter + && let Some(selected) = self.fuzzy_list.selected() + && let Some(project) = self.items.iter().find(|item| item.name == *selected) + { + let new_project = openstack_sdk::types::identity::v3::Project { + id: Some(project.id.clone()), + name: Some(project.name.clone()), + domain: Some(openstack_sdk::types::identity::v3::Domain { + id: Some(project.domain_id.clone()), + name: None, + }), + }; + let new_scope = openstack_sdk::auth::authtoken::AuthTokenScope::Project(new_project); + return Ok(Some(Action::CloudChangeScope(new_scope))); } Ok(None) } diff --git a/openstack_tui/src/components/resource_select_popup.rs b/openstack_tui/src/components/resource_select_popup.rs index da0f122fe..f6f26d160 100644 --- a/openstack_tui/src/components/resource_select_popup.rs +++ b/openstack_tui/src/components/resource_select_popup.rs @@ -56,16 +56,15 @@ impl Component for ApiRequestSelect { fn handle_key_events(&mut self, key: KeyEvent) -> Result, TuiError> { self.fuzzy_list.handle_key_events(key)?; - if key.code == KeyCode::Enter { - if let Some(selected) = self.fuzzy_list.selected() { - if let Some(item) = self.config.mode_aliases.get(selected.as_str()) { - self.fuzzy_list.reset_filter()?; - return Ok(Some(Action::Mode { - mode: *item, - stack: false, - })); - } - } + if key.code == KeyCode::Enter + && let Some(selected) = self.fuzzy_list.selected() + && let Some(item) = self.config.mode_aliases.get(selected.as_str()) + { + self.fuzzy_list.reset_filter()?; + return Ok(Some(Action::Mode { + mode: *item, + stack: false, + })); } Ok(None) } diff --git a/openstack_tui/src/components/table_view.rs b/openstack_tui/src/components/table_view.rs index 500e316d3..b0189769d 100644 --- a/openstack_tui/src/components/table_view.rs +++ b/openstack_tui/src/components/table_view.rs @@ -477,14 +477,14 @@ where .or(data.get("uuid")) .ok_or_else(|| TuiError::EntryIdNotPresent(data.clone()))?; for (idx, raw_item) in self.raw_items.iter_mut().enumerate() { - if let Some(row_id) = raw_item.get("id").or(raw_item.get("uuid")) { - if row_id == updated_entry_id { - *raw_item = data.clone(); - if let Some(typed_row) = self.items.get_mut(idx) { - *typed_row = updated_item; - self.sync_table_data()?; - break; - } + if let Some(row_id) = raw_item.get("id").or(raw_item.get("uuid")) + && row_id == updated_entry_id + { + *raw_item = data.clone(); + if let Some(typed_row) = self.items.get_mut(idx) { + *typed_row = updated_item; + self.sync_table_data()?; + break; } } } @@ -651,10 +651,10 @@ where #[instrument(level = "debug", skip(self))] pub fn get_item_row_by_res_id_mut(&mut self, search_id: &String) -> Option<&mut T> { for (idx, raw_item) in self.raw_items.iter_mut().enumerate() { - if let Some(row_item_id) = raw_item.get("id").or(raw_item.get("uuid")) { - if row_item_id == search_id { - return self.items.get_mut(idx); - } + if let Some(row_item_id) = raw_item.get("id").or(raw_item.get("uuid")) + && row_item_id == search_id + { + return self.items.get_mut(idx); } } None @@ -665,11 +665,11 @@ where pub fn delete_item_row_by_res_id_mut(&mut self, search_id: &String) -> Result> { let mut item_idx: Option = None; for (idx, raw_item) in self.raw_items.iter_mut().enumerate() { - if let Some(row_item_id) = raw_item.get("id").or(raw_item.get("uuid")) { - if row_item_id == search_id { - item_idx = Some(idx); - break; - } + if let Some(row_item_id) = raw_item.get("id").or(raw_item.get("uuid")) + && row_item_id == search_id + { + item_idx = Some(idx); + break; } } if let Some(idx) = item_idx {