Skip to content
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

Jump to bottom

refactor(test): cargo clippy #349

Merged
merged 1 commit into from
Jul 16, 2024
Merged

refactor(test): cargo clippy #349

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
4 changes: 1 addition & 3 deletions e2e/heaptrack/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ fn cb(_: Payload, socket: Client) -> Pin<Box<dyn std::future::Future<Output = ()
loop {
inter.tick().await;
let _ = socket.emit("ping", serde_json::Value::Null).await;
let _ = socket
.emit("ping", (0..u8::MAX).into_iter().collect::<Vec<u8>>())
.await;
let _ = socket.emit("ping", (0..u8::MAX).collect::<Vec<u8>>()).await;
}
});
})
Expand Down
12 changes: 6 additions & 6 deletions engineioxide/benches/packet_encode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@ fn criterion_benchmark(c: &mut Criterion) {
));
b.iter_batched(
|| packet.clone(),
|p| TryInto::<String>::try_into(p),
TryInto::<String>::try_into,
BatchSize::SmallInput,
)
});
group.bench_function("Encode packet ping/pong", |b| {
let packet = Packet::Ping;
b.iter_batched(
|| packet.clone(),
|p| TryInto::<String>::try_into(p),
TryInto::<String>::try_into,
BatchSize::SmallInput,
)
});
group.bench_function("Encode packet ping/pong upgrade", |b| {
let packet = Packet::PingUpgrade;
b.iter_batched(
|| packet.clone(),
|p| TryInto::<String>::try_into(p),
TryInto::<String>::try_into,
BatchSize::SmallInput,
)
});
group.bench_function("Encode packet message", |b| {
let packet = Packet::Message(black_box("Hello").into());
b.iter_batched(
|| packet.clone(),
|p| TryInto::<String>::try_into(p),
TryInto::<String>::try_into,
BatchSize::SmallInput,
)
});
group.bench_function("Encode packet noop", |b| {
let packet = Packet::Noop;
b.iter_batched(
|| packet.clone(),
|p| TryInto::<String>::try_into(p),
TryInto::<String>::try_into,
BatchSize::SmallInput,
)
});
Expand All @@ -53,7 +53,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let packet = Packet::Binary(BYTES);
b.iter_batched(
|| packet.clone(),
|p| TryInto::<String>::try_into(p),
TryInto::<String>::try_into,
BatchSize::SmallInput,
)
});
Expand Down
4 changes: 2 additions & 2 deletions engineioxide/src/transport/polling/payload/decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ mod tests {
payload.next().await.unwrap().unwrap(),
Packet::Message(msg) if msg == "f"
));
assert_eq!(payload.next().await.is_none(), true);
assert!(payload.next().await.is_none());
}

#[tokio::test]
Expand All @@ -406,7 +406,7 @@ mod tests {
payload.next().await.unwrap().unwrap(),
Packet::Message(msg) if msg == "fo"
));
assert_eq!(payload.next().await.is_none(), true);
assert!(payload.next().await.is_none());
}
}

Expand Down
1 change: 1 addition & 0 deletions engineioxide/src/transport/polling/payload/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ pub fn decoder(
}

/// A payload to transmit to the client through http polling
#[non_exhaustive]
pub struct Payload {
pub data: Bytes,
pub has_binary: bool,
Expand Down
8 changes: 7 additions & 1 deletion engineioxide/tests/fixture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,13 @@ pub async fn send_req(
}

pub async fn create_polling_connection(port: u16) -> String {
let body = send_req(port, format!("transport=polling"), http::Method::GET, None).await;
let body = send_req(
port,
"transport=polling".to_string(),
http::Method::GET,
None,
)
.await;
let open_packet: OpenPacket = serde_json::from_str(&body).unwrap();
open_packet.sid
}
Expand Down
38 changes: 13 additions & 25 deletions socketioxide/benches/packet_decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let mut group = c.benchmark_group("socketio_packet/decode");
group.bench_function("Decode packet connect on /", |b| {
let packet: String =
Packet::connect(black_box("/"), black_box(Sid::ZERO), ProtocolVersion::V5)
.try_into()
.unwrap();
Packet::connect(black_box("/"), black_box(Sid::ZERO), ProtocolVersion::V5).into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});
group.bench_function("Decode packet connect on /custom_nsp", |b| {
Expand All @@ -20,8 +18,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(Sid::ZERO),
ProtocolVersion::V5,
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -30,9 +27,7 @@ fn criterion_benchmark(c: &mut Criterion) {
group.bench_function("Decode packet event on /", |b| {
let data = serde_json::to_value(DATA).unwrap();
let packet: String =
Packet::event(black_box("/"), black_box("event"), black_box(data.clone()))
.try_into()
.unwrap();
Packet::event(black_box("/"), black_box("event"), black_box(data.clone())).into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -43,8 +38,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box("event"),
black_box(data.clone()),
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -56,7 +50,7 @@ fn criterion_benchmark(c: &mut Criterion) {
PacketData::Event(_, _, mut ack) => ack.insert(black_box(0)),
_ => panic!("Wrong packet type"),
};
let packet: String = packet.try_into().unwrap();
let packet: String = packet.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -71,16 +65,15 @@ fn criterion_benchmark(c: &mut Criterion) {
PacketData::Event(_, _, mut ack) => ack.insert(black_box(0)),
_ => panic!("Wrong packet type"),
};
let packet: String = packet.try_into().unwrap();
let packet: String = packet.into();

b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

group.bench_function("Decode packet ack on /", |b| {
let data = serde_json::to_value(DATA).unwrap();
let packet: String = Packet::ack(black_box("/"), black_box(data.clone()), black_box(0))
.try_into()
.unwrap();
let packet: String =
Packet::ack(black_box("/"), black_box(data.clone()), black_box(0)).into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -91,8 +84,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(data.clone()),
black_box(0),
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -104,8 +96,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(data.clone()),
black_box(vec![BINARY.clone()]),
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -117,8 +108,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(data.clone()),
black_box(vec![BINARY.clone()]),
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -130,8 +120,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(vec![BINARY.clone()]),
black_box(0),
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand All @@ -143,8 +132,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(vec![BINARY.clone()]),
black_box(0),
)
.try_into()
.unwrap();
.into();
b.iter(|| Packet::try_from(packet.clone()).unwrap())
});

Expand Down
24 changes: 12 additions & 12 deletions socketioxide/benches/packet_encode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn criterion_benchmark(c: &mut Criterion) {
group.bench_function("Encode packet connect on /", |b| {
let packet = Packet::connect(black_box("/"), black_box(Sid::ZERO), ProtocolVersion::V5);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});
group.bench_function("Encode packet connect on /custom_nsp", |b| {
Expand All @@ -20,7 +20,7 @@ fn criterion_benchmark(c: &mut Criterion) {
ProtocolVersion::V5,
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -31,7 +31,7 @@ fn criterion_benchmark(c: &mut Criterion) {
let data = serde_json::to_value(DATA).unwrap();
let packet = Packet::event(black_box("/"), black_box("event"), black_box(data.clone()));
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -43,7 +43,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(data.clone()),
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -55,7 +55,7 @@ fn criterion_benchmark(c: &mut Criterion) {
_ => panic!("Wrong packet type"),
};
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -71,15 +71,15 @@ fn criterion_benchmark(c: &mut Criterion) {
_ => panic!("Wrong packet type"),
};
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

group.bench_function("Encode packet ack on /", |b| {
let data = serde_json::to_value(DATA).unwrap();
let packet = Packet::ack(black_box("/"), black_box(data.clone()), black_box(0));
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -91,7 +91,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(0),
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -104,7 +104,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(vec![BINARY.clone()]),
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -117,7 +117,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(vec![BINARY.clone()]),
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -130,7 +130,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(0),
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand All @@ -143,7 +143,7 @@ fn criterion_benchmark(c: &mut Criterion) {
black_box(0),
);
b.iter(|| {
let _: String = packet.clone().try_into().unwrap();
let _: String = packet.clone().into();
})
});

Expand Down
10 changes: 5 additions & 5 deletions socketioxide/src/ack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ mod test {

fn create_socket() -> Arc<Socket<LocalAdapter>> {
let sid = Sid::new();
let ns = Namespace::<LocalAdapter>::new_dummy([sid]).into();
let ns = Namespace::<LocalAdapter>::new_dummy([sid]);
let socket = Socket::new_dummy(sid, ns);
socket.into()
}
Expand All @@ -338,8 +338,8 @@ mod test {

futures_util::pin_mut!(stream);

assert!(matches!(stream.next().await.unwrap().1, Ok(_)));
assert!(matches!(stream.next().await.unwrap().1, Ok(_)));
assert!(stream.next().await.unwrap().1.is_ok());
assert!(stream.next().await.unwrap().1.is_ok());
assert!(stream.next().await.is_none());
}

Expand Down Expand Up @@ -459,7 +459,7 @@ mod test {

let (id, ack) = stream.next().await.unwrap();
assert_eq!(id, socket.id);
assert!(matches!(ack, Ok(_)));
assert!(ack.is_ok());

let sid = socket2.id;
socket2.disconnect().unwrap();
Expand Down Expand Up @@ -514,7 +514,7 @@ mod test {

futures_util::pin_mut!(stream);

assert!(matches!(stream.next().await.unwrap().1, Ok(_)));
assert!(stream.next().await.unwrap().1.is_ok());
assert!(matches!(
stream.next().await.unwrap().1.unwrap_err(),
AckError::Timeout
Expand Down
2 changes: 1 addition & 1 deletion socketioxide/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ mod test {
let client = create_client();
let ns = Namespace::new(Str::from("/"), || {});
client.nsps.write().unwrap().insert(Str::from("/"), ns);
assert!(matches!(client.get_ns("/"), Some(_)));
assert!(client.get_ns("/").is_some());
}

#[tokio::test]
Expand Down
Loading