From c513b5f2266c032040d615812fba463b053ee5b5 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 13 Oct 2016 14:09:06 +0200 Subject: [PATCH] Avoid an unnecessary clone when calling FileManagerStore::try_read_file. --- components/net/filemanager_thread.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs index d682ea02569b..567d2f187401 100644 --- a/components/net/filemanager_thread.rs +++ b/components/net/filemanager_thread.rs @@ -148,7 +148,7 @@ impl FileManager { } FileManagerThreadMsg::ReadFile(sender, id, check_url_validity, origin) => { spawn_named("read file".to_owned(), move || { - if let Err(e) = store.try_read_file(sender.clone(), id, check_url_validity, + if let Err(e) = store.try_read_file(&sender, id, check_url_validity, origin, cancel_listener) { let _ = sender.send(Err(FileManagerThreadError::BlobURLStoreError(e))); } @@ -374,7 +374,7 @@ impl FileManagerStore { }) } - fn get_blob_buf(&self, sender: IpcSender>, + fn get_blob_buf(&self, sender: &IpcSender>, id: &Uuid, origin_in: &FileOrigin, rel_pos: RelativePos, check_url_validity: bool, cancel_listener: Option) -> Result<(), BlobURLStoreError> { @@ -437,7 +437,7 @@ impl FileManagerStore { } // Convenient wrapper over get_blob_buf - fn try_read_file(&self, sender: IpcSender>, + fn try_read_file(&self, sender: &IpcSender>, id: Uuid, check_url_validity: bool, origin_in: FileOrigin, cancel_listener: Option) -> Result<(), BlobURLStoreError> { self.get_blob_buf(sender, &id, &origin_in, RelativePos::full_range(), check_url_validity, cancel_listener) @@ -550,7 +550,7 @@ fn select_files_pref_enabled() -> bool { const CHUNK_SIZE: usize = 8192; -fn chunked_read(sender: IpcSender>, +fn chunked_read(sender: &IpcSender>, file: &mut File, size: usize, opt_filename: Option, type_string: String, cancel_listener: Option) { // First chunk