From bfb723f95a8fc8c36006b4e2d3f5699ccea5877c Mon Sep 17 00:00:00 2001 From: Michal Grzedzicki Date: Sat, 4 Oct 2025 20:49:38 +0100 Subject: [PATCH] Fix mismatched_lifetime_syntaxes linter warnings --- src/packet.rs | 2 +- src/parse.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/packet.rs b/src/packet.rs index fc6cccd..f0dca80 100644 --- a/src/packet.rs +++ b/src/packet.rs @@ -87,7 +87,7 @@ impl From for u16 { } impl<'a> Packet<'a> { - pub(crate) fn decode(data: &[u8]) -> Result { + pub(crate) fn decode(data: &[u8]) -> Result> { parse_packet(data) } diff --git a/src/parse.rs b/src/parse.rs index f2427b5..ecf53c6 100644 --- a/src/parse.rs +++ b/src/parse.rs @@ -6,7 +6,7 @@ use crate::packet::{ Error as PacketError, Mode, Opts, Packet, PacketType, RwReq, }; -pub(crate) fn parse_packet(input: &[u8]) -> Result { +pub(crate) fn parse_packet(input: &[u8]) -> Result> { parse_packet_type(input) .and_then(|(packet_type, data)| match packet_type { PacketType::Rrq => parse_rrq(data), @@ -90,7 +90,7 @@ pub(crate) fn parse_opts(mut input: &[u8]) -> Option { Some(opts) } -fn parse_rrq(input: &[u8]) -> Option { +fn parse_rrq(input: &[u8]) -> Option> { let (filename, rest) = parse_nul_str(input)?; let (mode, rest) = parse_mode(rest)?; let opts = parse_opts(rest)?; @@ -102,7 +102,7 @@ fn parse_rrq(input: &[u8]) -> Option { })) } -fn parse_wrq(input: &[u8]) -> Option { +fn parse_wrq(input: &[u8]) -> Option> { let (filename, rest) = parse_nul_str(input)?; let (mode, rest) = parse_mode(rest)?; let opts = parse_opts(rest)?; @@ -114,12 +114,12 @@ fn parse_wrq(input: &[u8]) -> Option { })) } -fn parse_data(input: &[u8]) -> Option { +fn parse_data(input: &[u8]) -> Option> { let (block_nr, rest) = parse_u16_be(input)?; Some(Packet::Data(block_nr, rest)) } -fn parse_ack(input: &[u8]) -> Option { +fn parse_ack(input: &[u8]) -> Option> { let (block_nr, rest) = parse_u16_be(input)?; if !rest.is_empty() { @@ -129,7 +129,7 @@ fn parse_ack(input: &[u8]) -> Option { Some(Packet::Ack(block_nr)) } -fn parse_error(input: &[u8]) -> Option { +fn parse_error(input: &[u8]) -> Option> { let (code, rest) = parse_u16_be(input)?; let (msg, rest) = parse_nul_str(rest)?; @@ -140,7 +140,7 @@ fn parse_error(input: &[u8]) -> Option { Some(Packet::Error(PacketError::from_code(code, Some(msg)))) } -fn parse_oack(input: &[u8]) -> Option { +fn parse_oack(input: &[u8]) -> Option> { let opts = parse_opts(input)?; Some(Packet::OAck(opts)) }