Skip to content

Commit 02e7e25

Browse files
committed
Avoid mismatched lifetime lint
Signed-off-by: Matt Johnston <[email protected]>
1 parent 3b928a6 commit 02e7e25

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

mctp-estack/src/control.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl<'a> MctpControl<'a> {
297297
async fn handle_req(
298298
&mut self,
299299
req: &'_ MctpControlMsg<'_>,
300-
) -> ControlResult<MctpControlMsg> {
300+
) -> ControlResult<MctpControlMsg<'_>> {
301301
let cc = req.command_code().map_err(|cc| {
302302
debug!("Unsupported control command {}", cc);
303303
CompletionCode::ErrorUnsupportedCmd

mctp-estack/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ impl Stack {
361361
pub fn receive(
362362
&mut self,
363363
packet: &[u8],
364-
) -> Result<Option<(MctpMessage, ReceiveHandle)>> {
364+
) -> Result<Option<(MctpMessage<'_>, ReceiveHandle)>> {
365365
// Get or insert a reassembler for this packet
366366
let idx = self.get_reassembler(packet)?;
367367
let (re, buf) = if let Some(r) = &mut self.reassemblers[idx] {
@@ -430,7 +430,7 @@ impl Stack {
430430
}
431431

432432
/// Provides a message previously returned from [`receive`](Self::receive)
433-
pub fn fetch_message(&mut self, handle: &ReceiveHandle) -> MctpMessage {
433+
pub fn fetch_message(&mut self, handle: &ReceiveHandle) -> MctpMessage<'_> {
434434
let Some(Some((re, buf))) = self.reassemblers.get_mut(handle.0) else {
435435
// ReceiveHandle can only be constructed when
436436
// a completed message exists, so this should be impossible.

mctp-estack/src/router.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,10 @@ impl<'a> PortBuilder<'a> {
278278
}
279279
}
280280

281-
pub fn build(&mut self, mtu: usize) -> Result<(PortTop, PortBottom)> {
281+
pub fn build(
282+
&mut self,
283+
mtu: usize,
284+
) -> Result<(PortTop<'_>, PortBottom<'_>)> {
282285
if mtu > MAX_MTU {
283286
debug!("port mtu {} > MAX_MTU {}", mtu, MAX_MTU);
284287
return Err(Error::BadArgument);

mctp-estack/src/usb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl MctpUsbHandler {
9494
xfer: &mut impl MctpUsbXfer,
9595
mctp: &mut Stack,
9696
fill_msg: F,
97-
) -> SendOutput
97+
) -> SendOutput<'_>
9898
where
9999
F: FnOnce(&mut Vec<u8, MAX_PAYLOAD>) -> Option<()>,
100100
{

pldm-fw/src/ua.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pub fn query_device_identifiers(
153153

154154
pub fn query_firmware_parameters(
155155
comm: &mut impl mctp::ReqChannel,
156-
) -> Result<FirmwareParameters> {
156+
) -> Result<FirmwareParameters<'_>> {
157157
let req = pldm::PldmRequest::new(PLDM_TYPE_FW, 0x02);
158158

159159
let rsp = pldm::pldm_xfer(comm, req)?;

standalone/src/serial.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl<S: Read + Write> Inner<S> {
9191
fn receive(
9292
&mut self,
9393
deadline: Option<u64>,
94-
) -> Result<(MctpMessage, ReceiveHandle)> {
94+
) -> Result<(MctpMessage<'_>, ReceiveHandle)> {
9595
let now = self.now();
9696

9797
let deadline = if let Some(d) = deadline {

0 commit comments

Comments
 (0)