Fix clippy lints

nautechsystems · Apr 15, 2024 · 3ca1d11 · 3ca1d11
1 parent 4896771
commit 3ca1d11
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 18 deletions.
diff --git a/nautilus_core/accounting/src/account/stubs.rs b/nautilus_core/accounting/src/account/stubs.rs
@@ -44,6 +44,7 @@ pub fn cash_account_multi(cash_account_state_multi: AccountState) -> CashAccount
     CashAccount::new(cash_account_state_multi, true).unwrap()
 }
 
+#[must_use]
 pub fn calculate_commission(
     instrument: InstrumentAny,
     quantity: Quantity,

diff --git a/nautilus_core/core/src/nanos.rs b/nautilus_core/core/src/nanos.rs
@@ -73,13 +73,13 @@ impl PartialOrd<Option<u64>> for UnixNanos {
 
 impl From<u64> for UnixNanos {
     fn from(value: u64) -> Self {
-        UnixNanos(value)
+        Self(value)
     }
 }
 
 impl From<&str> for UnixNanos {
     fn from(value: &str) -> Self {
-        UnixNanos(value.parse().unwrap())
+        Self(value.parse().unwrap())
     }
 }
 
@@ -208,6 +208,6 @@ mod tests {
     #[rstest]
     fn test_display() {
         let nanos = UnixNanos::from(123);
-        assert_eq!(format!("{}", nanos), "123");
+        assert_eq!(format!("{nanos}"), "123");
     }
 }
diff --git a/nautilus_core/execution/src/engine.rs b/nautilus_core/execution/src/engine.rs
@@ -62,26 +62,32 @@ pub struct ExecutionEngine {
 }
 
 impl ExecutionEngine {
+    #[must_use]
     pub fn position_id_count(&self, strategy_id: StrategyId) -> u64 {
         todo!();
     }
 
+    #[must_use]
     pub fn check_integrity(&self) -> bool {
         todo!();
     }
 
+    #[must_use]
     pub fn check_connected(&self) -> bool {
         todo!();
     }
 
+    #[must_use]
     pub fn check_disconnected(&self) -> bool {
         todo!();
     }
 
+    #[must_use]
     pub fn check_residuals(&self) -> bool {
         todo!();
     }
 
+    #[must_use]
     pub fn get_external_order_claims_instruments(&self) -> HashSet<InstrumentId> {
         todo!();
     }

diff --git a/nautilus_core/execution/src/messages/mod.rs b/nautilus_core/execution/src/messages/mod.rs
@@ -41,6 +41,7 @@ pub enum TradingCommand {
 }
 
 impl TradingCommand {
+    #[must_use]
     pub fn client_id(&self) -> ClientId {
         match self {
             Self::SubmitOrder(command) => command.client_id,
@@ -53,6 +54,7 @@ impl TradingCommand {
         }
     }
 
+    #[must_use]
     pub fn instrument_id(&self) -> InstrumentId {
         match self {
             Self::SubmitOrder(command) => command.instrument_id,

diff --git a/nautilus_core/execution/src/messages/submit.rs b/nautilus_core/execution/src/messages/submit.rs
@@ -24,7 +24,7 @@ use nautilus_model::identifiers::{
 };
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, PartialEq, Debug, Default, Serialize, Deserialize, Builder)]
+#[derive(Clone, PartialEq, Eq, Debug, Default, Serialize, Deserialize, Builder)]
 #[builder(default)]
 #[serde(tag = "type")]
 pub struct SubmitOrder {

diff --git a/nautilus_core/model/src/instruments/crypto_perpetual.rs b/nautilus_core/model/src/instruments/crypto_perpetual.rs
@@ -22,15 +22,14 @@ use nautilus_core::{
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 
+use super::InstrumentAny;
 use crate::{
     enums::{AssetClass, InstrumentClass},
     identifiers::{instrument_id::InstrumentId, symbol::Symbol},
     instruments::Instrument,
     types::{currency::Currency, money::Money, price::Price, quantity::Quantity},
 };
 
-use super::InstrumentAny;
-
 #[repr(C)]
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[cfg_attr(

diff --git a/nautilus_core/model/src/instruments/mod.rs b/nautilus_core/model/src/instruments/mod.rs
@@ -54,6 +54,7 @@ pub enum InstrumentAny {
 }
 
 impl InstrumentAny {
+    #[must_use]
     pub fn id(&self) -> InstrumentId {
         match self {
             Self::CryptoFuture(inst) => inst.id,
@@ -67,6 +68,7 @@ impl InstrumentAny {
         }
     }
 
+    #[must_use]
     pub fn base_currency(&self) -> Option<Currency> {
         match self {
             Self::CryptoFuture(inst) => inst.base_currency(),
@@ -80,6 +82,7 @@ impl InstrumentAny {
         }
     }
 
+    #[must_use]
     pub fn quote_currency(&self) -> Currency {
         match self {
             Self::CryptoFuture(inst) => inst.quote_currency(),
@@ -93,6 +96,7 @@ impl InstrumentAny {
         }
     }
 
+    #[must_use]
     pub fn settlement_currency(&self) -> Currency {
         match self {
             Self::CryptoFuture(inst) => inst.settlement_currency(),
@@ -106,6 +110,7 @@ impl InstrumentAny {
         }
     }
 
+    #[must_use]
     pub fn is_inverse(&self) -> bool {
         match self {
             Self::CryptoFuture(inst) => inst.is_inverse(),
@@ -119,6 +124,7 @@ impl InstrumentAny {
         }
     }
 
+    #[must_use]
     pub fn calculate_notional_value(
         &self,
         quantity: Quantity,
@@ -154,6 +160,7 @@ impl InstrumentAny {
     }
 
     // #[deprecated(since = "0.21.0", note = "Will be removed in a future version")]
+    #[must_use]
     pub fn maker_fee(&self) -> Decimal {
         match self {
             Self::CryptoFuture(inst) => inst.maker_fee(),
@@ -168,6 +175,7 @@ impl InstrumentAny {
     }
 
     // #[deprecated(since = "0.21.0", note = "Will be removed in a future version")]
+    #[must_use]
     pub fn taker_fee(&self) -> Decimal {
         match self {
             Self::CryptoFuture(inst) => inst.taker_fee(),

diff --git a/nautilus_core/model/src/orders/base.rs b/nautilus_core/model/src/orders/base.rs
@@ -845,7 +845,7 @@ pub struct OrderCore {
 impl OrderCore {
     pub fn new(init: OrderInitialized) -> anyhow::Result<Self> {
         let events: Vec<OrderEvent> = vec![OrderEvent::OrderInitialized(init.clone())];
-        Ok(OrderCore {
+        Ok(Self {
             events,
             commissions: HashMap::new(),
             venue_order_ids: Vec::new(),

diff --git a/nautilus_core/model/src/python/orders/limit.rs b/nautilus_core/model/src/python/orders/limit.rs
@@ -169,7 +169,7 @@ impl LimitOrder {
     #[getter]
     #[pyo3(name = "expire_time")]
     fn py_expire_time(&self) -> Option<u64> {
-        self.expire_time.map(|e| e.into())
+        self.expire_time.map(std::convert::Into::into)
     }
 
     #[getter]
@@ -335,7 +335,7 @@ impl LimitOrder {
     #[getter]
     #[pyo3(name = "expire_time_ns")]
     fn py_expire_time_ns(&self) -> Option<u64> {
-        self.expire_time.map(|e| e.into())
+        self.expire_time.map(std::convert::Into::into)
     }
 
     #[getter]

diff --git a/nautilus_core/model/src/python/orders/limit_if_touched.rs b/nautilus_core/model/src/python/orders/limit_if_touched.rs
@@ -75,7 +75,7 @@ impl LimitIfTouchedOrder {
             trigger_price,
             trigger_type,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             post_only,
             reduce_only,
             quote_quantity,

diff --git a/nautilus_core/model/src/python/orders/market_if_touched.rs b/nautilus_core/model/src/python/orders/market_if_touched.rs
@@ -72,7 +72,7 @@ impl MarketIfTouchedOrder {
             trigger_price,
             trigger_type,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             reduce_only,
             quote_quantity,
             display_qty,

diff --git a/nautilus_core/model/src/python/orders/market_to_limit.rs b/nautilus_core/model/src/python/orders/market_to_limit.rs
@@ -67,7 +67,7 @@ impl MarketToLimitOrder {
             order_side,
             quantity,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             post_only,
             reduce_only,
             quote_quantity,

diff --git a/nautilus_core/model/src/python/orders/stop_limit.rs b/nautilus_core/model/src/python/orders/stop_limit.rs
@@ -79,7 +79,7 @@ impl StopLimitOrder {
             trigger_price,
             trigger_type,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             post_only,
             reduce_only,
             quote_quantity,
@@ -184,7 +184,7 @@ impl StopLimitOrder {
     #[getter]
     #[pyo3(name = "expire_time")]
     fn py_expire_time(&self) -> Option<u64> {
-        self.expire_time.map(|e| e.into())
+        self.expire_time.map(std::convert::Into::into)
     }
 
     #[getter]

diff --git a/nautilus_core/model/src/python/orders/stop_market.rs b/nautilus_core/model/src/python/orders/stop_market.rs
@@ -72,7 +72,7 @@ impl StopMarketOrder {
             trigger_price,
             trigger_type,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             reduce_only,
             quote_quantity,
             display_qty,

diff --git a/nautilus_core/model/src/python/orders/trailing_stop_limit.rs b/nautilus_core/model/src/python/orders/trailing_stop_limit.rs
@@ -81,7 +81,7 @@ impl TrailingStopLimitOrder {
             trailing_offset,
             trailing_offset_type,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             post_only,
             reduce_only,
             quote_quantity,

diff --git a/nautilus_core/model/src/python/orders/trailing_stop_market.rs b/nautilus_core/model/src/python/orders/trailing_stop_market.rs
@@ -76,7 +76,7 @@ impl TrailingStopMarketOrder {
             trailing_offset,
             trailing_offset_type,
             time_in_force,
-            expire_time.map(|x| x.into()),
+            expire_time.map(std::convert::Into::into),
             reduce_only,
             quote_quantity,
             display_qty,

diff --git a/nautilus_core/model/src/python/position.rs b/nautilus_core/model/src/python/position.rs
@@ -203,7 +203,7 @@ impl Position {
     #[getter]
     #[pyo3(name = "ts_closed")]
     fn py_ts_closed(&self) -> Option<u64> {
-        self.ts_closed.map(|ts_closed| ts_closed.into())
+        self.ts_closed.map(std::convert::Into::into)
     }
 
     #[getter]