From 1ee8d79d4596f84e75c5fdf17767487f24b0ed35 Mon Sep 17 00:00:00 2001 From: Michal Budzynski Date: Tue, 1 Aug 2017 11:49:23 +0200 Subject: [PATCH] Removed `self.logger.clone()` in filesink/filesrc with split borrows --- gst-plugin-file/src/filesink.rs | 6 +++--- gst-plugin-file/src/filesrc.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gst-plugin-file/src/filesink.rs b/gst-plugin-file/src/filesink.rs index 3796132f..b1330808 100644 --- a/gst-plugin-file/src/filesink.rs +++ b/gst-plugin-file/src/filesink.rs @@ -111,12 +111,12 @@ impl Sink for FileSink { } fn render(&mut self, buffer: &Buffer) -> Result<(), FlowError> { - // FIXME: Because we borrow streaming state mutably below - let logger = self.logger.clone(); + let logger = &self.logger; + let streaming_state = &mut self.streaming_state; trace!(logger, "Rendering {:?}", buffer); - let (file, position) = match self.streaming_state { + let (file, position) = match *streaming_state { StreamingState::Started { ref mut file, ref mut position, diff --git a/gst-plugin-file/src/filesrc.rs b/gst-plugin-file/src/filesrc.rs index 8a4657a8..01f3dfa5 100644 --- a/gst-plugin-file/src/filesrc.rs +++ b/gst-plugin-file/src/filesrc.rs @@ -120,10 +120,10 @@ impl Source for FileSrc { } fn fill(&mut self, offset: u64, _: u32, buffer: &mut Buffer) -> Result<(), FlowError> { - // FIXME: Because we borrow streaming state mutably below - let logger = self.logger.clone(); + let logger = &self.logger; + let streaming_state = &mut self.streaming_state; - let (file, position) = match self.streaming_state { + let (file, position) = match *streaming_state { StreamingState::Started { ref mut file, ref mut position,