noa/flurry
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make clippy happy

Browse source
This commit is contained in:
Noa Aarts 2024-10-19 15:34:03 +02:00
parent a8bc1555c2
commit a27dcf013f
Signed by: noa
GPG key ID: 1850932741EFF672
6 changed files with 30 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/protocols/binary_protocol.rs
View file

@ -13,15 +13,9 @@ const SET_PX_RGB_BIN: u8 = 128;
const SET_PX_RGBA_BIN: u8 = 129;
const SET_PX_W_BIN: u8 = 130;
#[derive(Clone)]
#[derive(Clone, Default)]
pub struct BinaryParser {}
impl BinaryParser {
pub fn new() -> BinaryParser {
BinaryParser {}
}
}
impl<R: AsyncBufRead + AsyncBufReadExt + std::marker::Unpin> Parser<R> for BinaryParser {
async fn parse(&self, reader: &mut R) -> io::Result<Command> {
let fst = reader.read_u8().await;
@ -133,7 +127,7 @@ mod tests {
#[tokio::test]
async fn test_bin_help_parse() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new().read(&[HELP_BIN]).build();
let mut bufreader = BufReader::new(reader);
let thingy = parser.parse(&mut bufreader).await;
@ -142,7 +136,7 @@ mod tests {
#[tokio::test]
async fn test_bin_size_parse() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new().read(&[SIZE_BIN, 3]).build();
let mut bufreader = BufReader::new(reader);
let thingy = parser.parse(&mut bufreader).await;
@ -151,7 +145,7 @@ mod tests {
#[tokio::test]
async fn test_bin_px_set_w_parse() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new()
.read(&[SET_PX_W_BIN, 0x01, 0x69, 0x42, 0x42, 0x69, 0x82])
.build();
@ -165,7 +159,7 @@ mod tests {
#[tokio::test]
async fn test_bin_px_set_rgb_parse() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new()
.read(&[
SET_PX_RGB_BIN,
@ -189,7 +183,7 @@ mod tests {
#[tokio::test]
async fn test_bin_px_set_rgba_parse() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new()
.read(&[
SET_PX_RGBA_BIN,
@ -214,7 +208,7 @@ mod tests {
#[tokio::test]
async fn test_bin_px_get_parse() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new()
.read(&[GET_PX_BIN, 0x03, 0x69, 0x42, 0x42, 0x69])
.build();
@ -225,7 +219,7 @@ mod tests {
#[tokio::test]
async fn test_bin_parse_multiple() {
let parser = BinaryParser::new();
let parser = BinaryParser::default();
let reader = tokio_test::io::Builder::new()
.read(&[
SET_PX_RGB_BIN,

21
src/protocols/text_protocol.rs
View file

@ -1,6 +1,5 @@
use std::io::{self, Error, ErrorKind};
use atoi_radix10::parse_from_str;
use std::io::{self, Error, ErrorKind};
use tokio::io::{AsyncBufRead, AsyncBufReadExt, AsyncWriteExt};
use crate::{
@ -10,7 +9,7 @@ use crate::{
use super::{IOProtocol, Parser, Responder};
#[derive(Clone)]
#[derive(Clone, Default)]
pub struct TextParser {
canvas: Canvas,
}
@ -171,7 +170,7 @@ mod tests {
#[tokio::test]
async fn test_help_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new().read(b"HELP\n").build();
let mut bufreader = BufReader::new(reader);
let thingy = parser.parse(&mut bufreader).await;
@ -180,7 +179,7 @@ mod tests {
#[tokio::test]
async fn test_size_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new().read(b"SIZE\n").build();
let mut bufreader = BufReader::new(reader);
let thingy = parser.parse(&mut bufreader).await;
@ -189,7 +188,7 @@ mod tests {
#[tokio::test]
async fn test_canvas_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new().read(b"CANVAS 12\n").build();
let mut bufreader = BufReader::new(reader);
let thingy = parser.parse(&mut bufreader).await;
@ -198,7 +197,7 @@ mod tests {
#[tokio::test]
async fn test_px_set_w_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new()
.read(b"PX 28283 29991 81\n")
.build();
@ -212,7 +211,7 @@ mod tests {
#[tokio::test]
async fn test_px_set_rgb_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new()
.read(b"PX 28283 29991 8800ff\n")
.build();
@ -226,7 +225,7 @@ mod tests {
#[tokio::test]
async fn test_px_set_rgba_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new()
.read(b"PX 28283 29991 8800ff28\n")
.build();
@ -240,7 +239,7 @@ mod tests {
#[tokio::test]
async fn test_px_get_parse() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new()
.read(b"PX 28283 29991\n")
.build();
@ -251,7 +250,7 @@ mod tests {
#[tokio::test]
async fn parse_multiple() {
let parser = TextParser::new(0);
let parser = TextParser::default();
let reader = tokio_test::io::Builder::new()
.read(b"CANVAS 12\n")
.read(b"SIZE\n")