Skip to content

Commit ed1629b

Browse files
gtemagtema
authored
chore: Address some 1.89 clippy warnings (#1369)
1 parent 22de557 commit ed1629b

File tree

16 files changed

+159
-168
lines changed

16 files changed

+159
-168
lines changed

‎openstack_sdk/src/api/find.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ mod tests {
280280
fn method(&self) -> http::Method {
281281
http::Method::GET
282282
}
283-
284283
fn endpoint(&self) -> Cow<'static, str> {
285284
"dummies".into()
286285
}
@@ -290,7 +289,7 @@ mod tests {
290289
fn response_key(&self) -> Option<Cow<'static, str>> {
291290
Some("resources".into())
292291
}
293-
fn parameters(&self) -> QueryParams {
292+
fn parameters(&self) -> QueryParams<'_> {
294293
let mut params = QueryParams::default();
295294

296295
params.push_opt("name", self.name.as_ref());

‎openstack_sdk/src/api/rest_endpoint.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub trait RestEndpoint {
5151
fn service_type(&self) -> ServiceType;
5252

5353
/// Query parameters for the endpoint.
54-
fn parameters(&self) -> QueryParams {
54+
fn parameters(&self) -> QueryParams<'_> {
5555
QueryParams::default()
5656
}
5757

‎openstack_sdk/src/auth/auth_token_endpoint.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ impl RestEndpoint for Request<'_> {
340340
"auth/tokens".to_string().into()
341341
}
342342

343-
fn parameters(&self) -> QueryParams {
343+
fn parameters(&self) -> QueryParams<'_> {
344344
QueryParams::default()
345345
}
346346

‎openstack_tui/src/app.rs‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,15 @@ impl App {
303303
_ => {}
304304
}
305305
if let Some(popup_type) = &self.active_popup {
306-
if let Some(popup) = self.popups.get_mut(popup_type) {
307-
if let Some(action) = popup.handle_events(Some(event.clone()))? {
308-
action_tx.send(action)?;
309-
}
310-
}
311-
} else if let Some(component) = self.components.get_mut(&self.mode) {
312-
if let Some(action) = component.handle_events(Some(event.clone()))? {
306+
if let Some(popup) = self.popups.get_mut(popup_type)
307+
&& let Some(action) = popup.handle_events(Some(event.clone()))?
308+
{
313309
action_tx.send(action)?;
314310
}
311+
} else if let Some(component) = self.components.get_mut(&self.mode)
312+
&& let Some(action) = component.handle_events(Some(event.clone()))?
313+
{
314+
action_tx.send(action)?;
315315
}
316316
if let Some(action) = self.header.handle_events(Some(event.clone()))? {
317317
action_tx.send(action)?;
@@ -332,10 +332,10 @@ impl App {
332332
} else if key == KeyEvent::new(KeyCode::Char('c'), KeyModifiers::CONTROL) {
333333
action_tx.send(Action::Quit)?;
334334
} else if key.code == KeyCode::Esc && self.active_popup.is_some() {
335-
if let Some(popup_type) = &self.active_popup {
336-
if let Some(popup) = self.popups.get_mut(popup_type) {
337-
popup.handle_key_events(key)?;
338-
}
335+
if let Some(popup_type) = &self.active_popup
336+
&& let Some(popup) = self.popups.get_mut(popup_type)
337+
{
338+
popup.handle_key_events(key)?;
339339
}
340340
// Close the popup
341341
self.active_popup = None;
@@ -403,21 +403,21 @@ impl App {
403403
}
404404

405405
Action::ConnectedToCloud(_) => {
406-
if let Some(popup) = &self.active_popup {
407-
if popup == &Popup::SwitchProject {
408-
// Hide popup
409-
self.active_popup = None;
410-
}
406+
if let Some(popup) = &self.active_popup
407+
&& popup == &Popup::SwitchProject
408+
{
409+
// Hide popup
410+
self.active_popup = None;
411411
}
412412
self.cloud_connected = true;
413413
self.render(tui)?;
414414
}
415415
Action::CloudChangeScope(ref scope) => {
416-
if let Some(popup) = &self.active_popup {
417-
if popup == &Popup::SwitchProject {
418-
// Hide popup
419-
self.active_popup = None;
420-
}
416+
if let Some(popup) = &self.active_popup
417+
&& popup == &Popup::SwitchProject
418+
{
419+
// Hide popup
420+
self.active_popup = None;
421421
}
422422
self.render(tui)?;
423423
self.cloud_worker_tx
@@ -551,39 +551,36 @@ impl App {
551551
.as_ref(),
552552
)
553553
.split(f.area());
554-
if draw_header {
555-
if let Err(e) = self.header.draw(f, rects[0]) {
556-
self.action_tx
557-
.send(Action::Error {
558-
msg: format!("Failed to draw: {e:?}"),
559-
action: None,
560-
})
561-
.unwrap();
562-
}
554+
if draw_header && let Err(e) = self.header.draw(f, rects[0]) {
555+
self.action_tx
556+
.send(Action::Error {
557+
msg: format!("Failed to draw: {e:?}"),
558+
action: None,
559+
})
560+
.unwrap();
563561
}
564562

565-
if let Some(component) = self.components.get_mut(&self.mode) {
566-
if let Err(e) = component.draw(f, rects[1]) {
567-
error!("Error {:?}", e);
568-
self.action_tx
569-
.send(Action::Error {
570-
msg: format!("Failed to draw: {e:?}"),
571-
action: None,
572-
})
573-
.unwrap();
574-
}
563+
if let Some(component) = self.components.get_mut(&self.mode)
564+
&& let Err(e) = component.draw(f, rects[1])
565+
{
566+
error!("Error {:?}", e);
567+
self.action_tx
568+
.send(Action::Error {
569+
msg: format!("Failed to draw: {e:?}"),
570+
action: None,
571+
})
572+
.unwrap();
575573
}
576-
if let Some(popup_type) = &self.active_popup {
577-
if let Some(popup) = self.popups.get_mut(popup_type) {
578-
if let Err(e) = popup.draw(f, f.area()) {
579-
self.action_tx
580-
.send(Action::Error {
581-
msg: format!("Failed to draw: {e:?}"),
582-
action: None,
583-
})
584-
.unwrap();
585-
}
586-
}
574+
if let Some(popup_type) = &self.active_popup
575+
&& let Some(popup) = self.popups.get_mut(popup_type)
576+
&& let Err(e) = popup.draw(f, f.area())
577+
{
578+
self.action_tx
579+
.send(Action::Error {
580+
msg: format!("Failed to draw: {e:?}"),
581+
action: None,
582+
})
583+
.unwrap();
587584
}
588585
})?;
589586
Ok(())

‎openstack_tui/src/components/cloud_select_popup.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ impl Component for CloudSelect {
6666

6767
fn handle_key_events(&mut self, key: KeyEvent) -> Result<Option<Action>, TuiError> {
6868
self.fuzzy_list.handle_key_events(key)?;
69-
if key.code == KeyCode::Enter {
70-
if let Some(cloud) = self.fuzzy_list.selected() {
71-
return Ok(Some(Action::ConnectToCloud(cloud.clone())));
72-
}
69+
if key.code == KeyCode::Enter
70+
&& let Some(cloud) = self.fuzzy_list.selected()
71+
{
72+
return Ok(Some(Action::ConnectToCloud(cloud.clone())));
7373
}
7474
Ok(None)
7575
}

‎openstack_tui/src/components/compute/server_instance_action_events.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,12 @@ impl Component for ComputeServerInstanceActionEvents<'_> {
118118
request: ApiRequest::Compute(ComputeApiRequest::Server(req)),
119119
data,
120120
} => {
121-
if let ComputeServerApiRequest::InstanceAction(x) = *req {
122-
if let ComputeServerInstanceActionApiRequest::Get(_) = *x {
123-
if let Some(events) = data.get("events") {
124-
if let Some(ar) = events.as_array() {
125-
self.set_data(ar.to_vec())?;
126-
}
127-
}
128-
}
121+
if let ComputeServerApiRequest::InstanceAction(x) = *req
122+
&& let ComputeServerInstanceActionApiRequest::Get(_) = *x
123+
&& let Some(events) = data.get("events")
124+
&& let Some(ar) = events.as_array()
125+
{
126+
self.set_data(ar.to_vec())?;
129127
}
130128
}
131129
Action::SetComputeServerInstanceActionShowFilters(req) => {

‎openstack_tui/src/components/compute/server_instance_actions.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ impl Component for ComputeServerInstanceActions<'_> {
8989
request: ApiRequest::Compute(ComputeApiRequest::Server(req)),
9090
data,
9191
} => {
92-
if let ComputeServerApiRequest::InstanceAction(x) = *req {
93-
if let ComputeServerInstanceActionApiRequest::List(_) = *x {
94-
self.set_data(data)?;
95-
}
92+
if let ComputeServerApiRequest::InstanceAction(x) = *req
93+
&& let ComputeServerInstanceActionApiRequest::List(_) = *x
94+
{
95+
self.set_data(data)?;
9696
}
9797
}
9898
Action::SetComputeServerInstanceActionListFilters(filters) => {

‎openstack_tui/src/components/header.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -192,24 +192,24 @@ impl Component for Header {
192192
self.connection_data_rows
193193
.push((String::from("Cloud:"), self.cloud_name.clone()));
194194
if let Some(project) = &auth_token.project {
195-
if let Some(domain) = &project.domain {
196-
if let Some(name) = &domain.name {
197-
self.domain_name = name.clone();
198-
self.connection_data_rows
199-
.push((String::from("Domain:"), self.domain_name.clone()));
200-
}
195+
if let Some(domain) = &project.domain
196+
&& let Some(name) = &domain.name
197+
{
198+
self.domain_name = name.clone();
199+
self.connection_data_rows
200+
.push((String::from("Domain:"), self.domain_name.clone()));
201201
}
202202
if let Some(name) = &project.name {
203203
self.project_name = name.clone();
204204
self.connection_data_rows
205205
.push((String::from("Project:"), self.project_name.clone()));
206206
}
207-
} else if let Some(domain) = &auth_token.domain {
208-
if let Some(name) = &domain.name {
209-
self.domain_name = name.clone();
210-
self.connection_data_rows
211-
.push((String::from("Domain:"), self.domain_name.clone()));
212-
}
207+
} else if let Some(domain) = &auth_token.domain
208+
&& let Some(name) = &domain.name
209+
{
210+
self.domain_name = name.clone();
211+
self.connection_data_rows
212+
.push((String::from("Domain:"), self.domain_name.clone()));
213213
}
214214
}
215215
_ => {}

‎openstack_tui/src/components/home.rs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -106,25 +106,25 @@ impl Home {
106106
}
107107

108108
fn refresh_data(&mut self) -> Result<Option<Action>, TuiError> {
109-
if let Some(command_tx) = &self.command_tx {
110-
if let Some(project_id) = &self.project_id {
111-
command_tx.send(Action::PerformApiRequest(ApiRequest::from(
112-
ComputeQuotaSetApiRequest::Details(Box::new(
113-
ComputeQuotaSetShowBuilder::default()
114-
.id(project_id.clone())
115-
.build()
116-
.wrap_err("cannot prepare compute quota request")?,
117-
)),
118-
)))?;
119-
command_tx.send(Action::PerformApiRequest(ApiRequest::from(
120-
NetworkQuotaApiRequest::Details(Box::new(
121-
NetworkQuotaShowBuilder::default()
122-
.id(project_id.clone())
123-
.build()
124-
.wrap_err("cannot prepare network quota request")?,
125-
)),
126-
)))?;
127-
}
109+
if let Some(command_tx) = &self.command_tx
110+
&& let Some(project_id) = &self.project_id
111+
{
112+
command_tx.send(Action::PerformApiRequest(ApiRequest::from(
113+
ComputeQuotaSetApiRequest::Details(Box::new(
114+
ComputeQuotaSetShowBuilder::default()
115+
.id(project_id.clone())
116+
.build()
117+
.wrap_err("cannot prepare compute quota request")?,
118+
)),
119+
)))?;
120+
command_tx.send(Action::PerformApiRequest(ApiRequest::from(
121+
NetworkQuotaApiRequest::Details(Box::new(
122+
NetworkQuotaShowBuilder::default()
123+
.id(project_id.clone())
124+
.build()
125+
.wrap_err("cannot prepare network quota request")?,
126+
)),
127+
)))?;
128128
}
129129
Ok(None)
130130
}
@@ -152,10 +152,10 @@ impl Component for Home {
152152
self.set_loading(true);
153153
self.compute_quota = None;
154154
self.network_quota = None;
155-
if let Some(project) = auth.project {
156-
if let Some(pid) = project.id {
157-
self.project_id = Some(pid);
158-
}
155+
if let Some(project) = auth.project
156+
&& let Some(pid) = project.id
157+
{
158+
self.project_id = Some(pid);
159159
}
160160

161161
if current_mode == Mode::Home {

‎openstack_tui/src/components/identity/application_credentials.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ impl Component for IdentityApplicationCredentials<'_> {
100100
request: ApiRequest::Identity(IdentityApiRequest::User(req)),
101101
data,
102102
} => {
103-
if let IdentityUserApiRequest::ApplicationCredential(x) = *req {
104-
if let IdentityUserApplicationCredentialApiRequest::List(_) = *x {
105-
self.set_data(data)?;
106-
}
103+
if let IdentityUserApiRequest::ApplicationCredential(x) = *req
104+
&& let IdentityUserApplicationCredentialApiRequest::List(_) = *x
105+
{
106+
self.set_data(data)?;
107107
}
108108
}
109109
_ => {}

0 commit comments

Comments
 (0)