Skip to content

chore: Address some 1.89 clippy warnings #1369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Aug 11, 2025
Merged

chore: Address some 1.89 clippy warnings #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions openstack_sdk/src/api/find.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ mod tests {
fn method(&self) -> http::Method {
http::Method::GET
}

fn endpoint(&self) -> Cow<'static, str> {
"dummies".into()
}
Expand All @@ -290,7 +289,7 @@ mod tests {
fn response_key(&self) -> Option<Cow<'static, str>> {
Some("resources".into())
}
fn parameters(&self) -> QueryParams {
fn parameters(&self) -> QueryParams<'_> {
let mut params = QueryParams::default();

params.push_opt("name", self.name.as_ref());
Expand Down
2 changes: 1 addition & 1 deletion openstack_sdk/src/api/rest_endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
2 changes: 1 addition & 1 deletion openstack_sdk/src/auth/auth_token_endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ impl RestEndpoint for Request<'_> {
"auth/tokens".to_string().into()
}

fn parameters(&self) -> QueryParams {
fn parameters(&self) -> QueryParams<'_> {
QueryParams::default()
}

Expand Down
99 changes: 48 additions & 51 deletions openstack_tui/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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(())
Expand Down
8 changes: 4 additions & 4 deletions openstack_tui/src/components/cloud_select_popup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ impl Component for CloudSelect {

fn handle_key_events(&mut self, key: KeyEvent) -> Result<Option<Action>, 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)
}
Expand Down
14 changes: 6 additions & 8 deletions openstack_tui/src/components/compute/server_instance_action_events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
8 changes: 4 additions & 4 deletions openstack_tui/src/components/compute/server_instance_actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
24 changes: 12 additions & 12 deletions openstack_tui/src/components/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}
_ => {}
Expand Down
46 changes: 23 additions & 23 deletions openstack_tui/src/components/home.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,25 +106,25 @@ impl Home {
}

fn refresh_data(&mut self) -> Result<Option<Action>, 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)
}
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions openstack_tui/src/components/identity/application_credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
}
}
_ => {}
Expand Down
8 changes: 4 additions & 4 deletions openstack_tui/src/components/identity/group_users.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
}
}
_ => {}
Expand Down
14 changes: 7 additions & 7 deletions openstack_tui/src/components/identity/users.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,14 @@
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

Check warning

Code scanning / clippy

trailing irrefutable pattern in let chain Warning

trailing irrefutable pattern in let chain
{
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);
}
}
_ => {}
Expand Down
8 changes: 4 additions & 4 deletions openstack_tui/src/components/load_balancer/pool_members.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Loading