Skip to content

Commit ce6b76a

Browse files
committed
fix: Address clippy unnecessary_unwrap lint in plant login methods
Use `if let Some(err)` pattern instead of `is_none()` check followed by `unwrap()` to satisfy clippy's unnecessary_unwrap lint.
1 parent c3d1ed5 commit ce6b76a

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

src/plants/history_plant.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,10 @@ impl RithmicHistoryPlantHandle {
755755
.map_err(|_| "Connection closed".to_string())??
756756
.remove(0);
757757

758-
if response.error.is_none() {
758+
if let Some(err) = response.error {
759+
error!("history_plant: login failed {:?}", err);
760+
Err(err)
761+
} else {
759762
let _ = self.sender.send(HistoryPlantCommand::SetLogin).await;
760763

761764
if let RithmicMessage::ResponseLogin(resp) = &response.message {
@@ -772,10 +775,6 @@ impl RithmicHistoryPlantHandle {
772775
info!("history_plant: logged in");
773776

774777
Ok(response)
775-
} else {
776-
error!("history_plant: login failed {:?}", response.error);
777-
778-
Err(response.error.unwrap())
779778
}
780779
}
781780

src/plants/order_plant.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,10 @@ impl RithmicOrderPlantHandle {
13341334
.map_err(|_| "Connection closed".to_string())??
13351335
.remove(0);
13361336

1337-
if response.error.is_none() {
1337+
if let Some(err) = response.error {
1338+
error!("order_plant: login failed {:?}", err);
1339+
Err(err)
1340+
} else {
13381341
let _ = self.sender.send(OrderPlantCommand::SetLogin).await;
13391342

13401343
if let RithmicMessage::ResponseLogin(resp) = &response.message {
@@ -1351,10 +1354,6 @@ impl RithmicOrderPlantHandle {
13511354
info!("order_plant: logged in");
13521355

13531356
Ok(response)
1354-
} else {
1355-
error!("order_plant: login failed {:?}", response.error);
1356-
1357-
Err(response.error.unwrap())
13581357
}
13591358
}
13601359

src/plants/pnl_plant.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,10 @@ impl RithmicPnlPlantHandle {
602602
.map_err(|_| "Connection closed".to_string())??
603603
.remove(0);
604604

605-
if response.error.is_none() {
605+
if let Some(err) = response.error {
606+
error!("pnl_plant: login failed {:?}", err);
607+
Err(err)
608+
} else {
606609
let _ = self.sender.send(PnlPlantCommand::SetLogin).await;
607610

608611
if let RithmicMessage::ResponseLogin(resp) = &response.message {
@@ -619,10 +622,6 @@ impl RithmicPnlPlantHandle {
619622
info!("pnl_plant: logged in");
620623

621624
Ok(response)
622-
} else {
623-
error!("pnl_plant: login failed {:?}", response.error);
624-
625-
Err(response.error.unwrap())
626625
}
627626
}
628627

src/plants/ticker_plant.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,10 @@ impl RithmicTickerPlantHandle {
985985
.map_err(|_| "Connection closed".to_string())??
986986
.remove(0);
987987

988-
if response.error.is_none() {
988+
if let Some(err) = response.error {
989+
error!("ticker_plant: login failed {:?}", err);
990+
Err(err)
991+
} else {
989992
let _ = self.sender.send(TickerPlantCommand::SetLogin).await;
990993

991994
if let RithmicMessage::ResponseLogin(resp) = &response.message {
@@ -1002,10 +1005,6 @@ impl RithmicTickerPlantHandle {
10021005
info!("ticker_plant: logged in");
10031006

10041007
Ok(response)
1005-
} else {
1006-
error!("ticker_plant: login failed {:?}", response.error);
1007-
1008-
Err(response.error.unwrap())
10091008
}
10101009
}
10111010

0 commit comments

Comments
 (0)