Skip to content

Commit 88cac10

Browse files
committed
chore: fix clippy warnings.
1 parent 7fb761f commit 88cac10

File tree

8 files changed

+20
-32
lines changed

8 files changed

+20
-32
lines changed

connector/src/bybit/msg.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::utils::{from_str_to_f64, from_str_to_f64_opt, from_str_to_i64};
1313

1414
struct SideVisitor;
1515

16-
impl<'de> Visitor<'de> for SideVisitor {
16+
impl Visitor<'_> for SideVisitor {
1717
type Value = Side;
1818

1919
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -41,7 +41,7 @@ where
4141

4242
struct OrdTypeVisitor;
4343

44-
impl<'de> Visitor<'de> for OrdTypeVisitor {
44+
impl Visitor<'_> for OrdTypeVisitor {
4545
type Value = OrdType;
4646

4747
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -72,7 +72,7 @@ where
7272

7373
struct TimeInForceVisitor;
7474

75-
impl<'de> Visitor<'de> for TimeInForceVisitor {
75+
impl Visitor<'_> for TimeInForceVisitor {
7676
type Value = TimeInForce;
7777

7878
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -102,7 +102,7 @@ where
102102

103103
struct StatusVisitor;
104104

105-
impl<'de> Visitor<'de> for StatusVisitor {
105+
impl Visitor<'_> for StatusVisitor {
106106
type Value = Status;
107107

108108
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

connector/src/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::bybit::BybitError;
2222

2323
struct I64Visitor;
2424

25-
impl<'de> Visitor<'de> for I64Visitor {
25+
impl Visitor<'_> for I64Visitor {
2626
type Value = Option<i64>;
2727

2828
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -67,7 +67,7 @@ impl<'de> Visitor<'de> for OptionF64Visitor {
6767

6868
struct F64Visitor;
6969

70-
impl<'de> Visitor<'de> for F64Visitor {
70+
impl Visitor<'_> for F64Visitor {
7171
type Value = Option<f64>;
7272

7373
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

hftbacktest/src/backtest/data/mod.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,13 @@ where
6060
}
6161

6262
pub fn from_data(data: &[D]) -> Self {
63-
let byte_len = size_of::<D>() * data.len();
63+
let byte_len = size_of_val(data);
6464
let bytes = unsafe { std::slice::from_raw_parts(data.as_ptr() as *const u8, byte_len) };
6565

66+
let dest_data_ptr = DataPtr::new(byte_len);
67+
6668
unsafe {
67-
let mut dest_data_ptr = DataPtr::new(byte_len);
68-
let mut dest_data = dest_data_ptr.ptr.as_mut().expect("data ptr is null");
69+
let dest_data = dest_data_ptr.ptr.as_mut().unwrap();
6970

7071
dest_data.copy_from_slice(bytes);
7172
Self::from_data_ptr(dest_data_ptr, 0)

hftbacktest/src/backtest/proc/l3_local.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
use std::{
2-
collections::{hash_map::Entry, HashMap},
3-
mem,
4-
};
1+
use std::collections::{hash_map::Entry, HashMap};
52

63
use crate::{
74
backtest::{
85
assettype::AssetType,
9-
data::{Data, Reader},
106
models::{FeeModel, LatencyModel},
117
order::OrderBus,
128
proc::{LocalProcessor, Processor},
@@ -244,7 +240,7 @@ where
244240
BacktestError: From<<MD as L3MarketDepth>::Error>,
245241
{
246242
fn time_seen(&self, event: &Event) -> Option<i64> {
247-
event.is(LOCAL_EVENT).then(|| event.local_ts)
243+
event.is(LOCAL_EVENT).then_some(event.local_ts)
248244
}
249245

250246
fn process(&mut self, ev: &Event) -> Result<(), BacktestError> {

hftbacktest/src/backtest/proc/l3_nopartialfillexchange.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
use std::mem;
2-
31
use crate::{
42
backtest::{
53
assettype::AssetType,
6-
data::{Data, Reader},
74
models::{FeeModel, L3QueueModel, LatencyModel},
85
order::OrderBus,
96
proc::Processor,
@@ -364,7 +361,7 @@ where
364361
BacktestError: From<<MD as L3MarketDepth>::Error>,
365362
{
366363
fn time_seen(&self, event: &Event) -> Option<i64> {
367-
event.is(EXCH_EVENT).then(|| event.exch_ts)
364+
event.is(EXCH_EVENT).then_some(event.exch_ts)
368365
}
369366

370367
fn process(&mut self, event: &Event) -> Result<(), BacktestError> {
@@ -390,17 +387,15 @@ where
390387
let (prev_best_bid_tick, best_bid_tick) =
391388
self.depth
392389
.add_buy_order(event.order_id, event.px, event.qty, event.exch_ts)?;
393-
self.queue_model
394-
.add_market_feed_order(&event, &self.depth)?;
390+
self.queue_model.add_market_feed_order(event, &self.depth)?;
395391
if best_bid_tick > prev_best_bid_tick {
396392
self.fill_ask_orders_by_crossing(prev_best_bid_tick, best_bid_tick, event.exch_ts)?;
397393
}
398394
} else if event.is(EXCH_ASK_ADD_ORDER_EVENT) {
399395
let (prev_best_ask_tick, best_ask_tick) =
400396
self.depth
401397
.add_sell_order(event.order_id, event.px, event.qty, event.exch_ts)?;
402-
self.queue_model
403-
.add_market_feed_order(&event, &self.depth)?;
398+
self.queue_model.add_market_feed_order(event, &self.depth)?;
404399
if best_ask_tick < prev_best_ask_tick {
405400
self.fill_bid_orders_by_crossing(prev_best_ask_tick, best_ask_tick, event.exch_ts)?;
406401
}
@@ -409,7 +404,7 @@ where
409404
self.depth
410405
.modify_order(event.order_id, event.px, event.qty, event.exch_ts)?;
411406
self.queue_model
412-
.modify_market_feed_order(event.order_id, &event, &self.depth)?;
407+
.modify_market_feed_order(event.order_id, event, &self.depth)?;
413408
if side == Side::Buy {
414409
if best_tick > prev_best_tick {
415410
self.fill_ask_orders_by_crossing(prev_best_tick, best_tick, event.exch_ts)?;
@@ -427,7 +422,7 @@ where
427422
if event.is(BUY_EVENT) || event.is(SELL_EVENT) {
428423
let filled = self.queue_model.fill_market_feed_order::<false>(
429424
event.order_id,
430-
&event,
425+
event,
431426
&self.depth,
432427
)?;
433428
let timestamp = event.exch_ts;

hftbacktest/src/backtest/proc/local.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ where
238238
FM: FeeModel,
239239
{
240240
fn time_seen(&self, event: &Event) -> Option<i64> {
241-
event.is(LOCAL_EVENT).then(|| event.local_ts)
241+
event.is(LOCAL_EVENT).then_some(event.local_ts)
242242
}
243243

244244
fn process(&mut self, ev: &Event) -> Result<(), BacktestError> {

hftbacktest/src/backtest/proc/nopartialfillexchange.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ use std::{
22
cell::RefCell,
33
cmp::Ordering,
44
collections::{HashMap, HashSet},
5-
mem,
65
rc::Rc,
76
};
87

98
use crate::{
109
backtest::{
1110
assettype::AssetType,
12-
data::{Data, Reader},
1311
models::{FeeModel, LatencyModel, QueueModel},
1412
order::OrderBus,
1513
proc::Processor,
@@ -655,7 +653,7 @@ where
655653
FM: FeeModel,
656654
{
657655
fn time_seen(&self, event: &Event) -> Option<i64> {
658-
event.is(EXCH_EVENT).then(|| event.exch_ts)
656+
event.is(EXCH_EVENT).then_some(event.exch_ts)
659657
}
660658

661659
fn process(&mut self, event: &Event) -> Result<(), BacktestError> {

hftbacktest/src/backtest/proc/partialfillexchange.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ use std::{
22
cell::RefCell,
33
cmp::Ordering,
44
collections::{HashMap, HashSet},
5-
mem,
65
rc::Rc,
76
};
87

98
use crate::{
109
backtest::{
1110
assettype::AssetType,
12-
data::{Data, Reader},
1311
models::{FeeModel, LatencyModel, QueueModel},
1412
order::OrderBus,
1513
proc::Processor,
@@ -857,7 +855,7 @@ where
857855
FM: FeeModel,
858856
{
859857
fn time_seen(&self, event: &Event) -> Option<i64> {
860-
event.is(EXCH_EVENT).then(|| event.exch_ts)
858+
event.is(EXCH_EVENT).then_some(event.exch_ts)
861859
}
862860

863861
fn process(&mut self, event: &Event) -> Result<(), BacktestError> {

0 commit comments

Comments
 (0)