From fd2940491d9b69dc3265d2e78aeb2b9d3e6a40b9 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Sat, 5 Oct 2024 14:40:56 +0200 Subject: [PATCH 1/2] Fix elided_named_lifetimes Signed-off-by: yubiuser --- connect/src/spirc.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 200c3f830..59a5d20f8 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -1534,7 +1534,7 @@ struct CommandSender<'a> { } impl<'a> CommandSender<'a> { - fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> CommandSender<'_> { + fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> CommandSender<'a> { let mut frame = protocol::spirc::Frame::new(); // frame version frame.set_version(1); @@ -1549,7 +1549,7 @@ impl<'a> CommandSender<'a> { CommandSender { spirc, frame } } - fn recipient(mut self, recipient: &'a str) -> CommandSender<'_> { + fn recipient(mut self, recipient: &'a str) -> CommandSender<'a> { self.frame.recipient.push(recipient.to_owned()); self } From a20aeace0dca2570f4ff16e82deb75300296a4f2 Mon Sep 17 00:00:00 2001 From: yubiuser Date: Sun, 6 Oct 2024 18:22:31 +0200 Subject: [PATCH 2/2] Change return type annotations to Self Signed-off-by: yubiuser --- connect/src/spirc.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 59a5d20f8..6eb3ab82d 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -1534,7 +1534,7 @@ struct CommandSender<'a> { } impl<'a> CommandSender<'a> { - fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> CommandSender<'a> { + fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> Self { let mut frame = protocol::spirc::Frame::new(); // frame version frame.set_version(1); @@ -1549,13 +1549,13 @@ impl<'a> CommandSender<'a> { CommandSender { spirc, frame } } - fn recipient(mut self, recipient: &'a str) -> CommandSender<'a> { + fn recipient(mut self, recipient: &'a str) -> Self { self.frame.recipient.push(recipient.to_owned()); self } #[allow(dead_code)] - fn state(mut self, state: protocol::spirc::State) -> CommandSender<'a> { + fn state(mut self, state: protocol::spirc::State) -> Self { *self.frame.state.mut_or_insert_default() = state; self }