Run clippy fix

This commit is contained in:
Julian Mutter 2023-11-28 08:27:56 +01:00
parent b2441ec2dc
commit 79ddd2680b
2 changed files with 5 additions and 7 deletions

View File

@ -38,11 +38,11 @@ impl PageCache {
pub fn get_page_or_cache(&mut self, page_number: usize) -> Result<Rc<MyPageType>> { pub fn get_page_or_cache(&mut self, page_number: usize) -> Result<Rc<MyPageType>> {
if let Some(page) = self.get_page(page_number) { if let Some(page) = self.get_page(page_number) {
return Ok(page); Ok(page)
} else { } else {
let _ = self.cache_page(page_number, 100); let _ = self.cache_page(page_number, 100);
if let Some(page) = self.get_page(page_number) { if let Some(page) = self.get_page(page_number) {
return Ok(page); Ok(page)
} else { } else {
bail!("Failed caching and retrieving page {}", page_number); bail!("Failed caching and retrieving page {}", page_number);
} }

View File

@ -57,21 +57,19 @@ impl DocumentCanvas {
pub fn cache_initial_pages(&self, area_height: i32) { pub fn cache_initial_pages(&self, area_height: i32) {
self.page_cache_sender.send_priority_cache_commands( self.page_cache_sender.send_priority_cache_commands(
&vec![self.current_page_number, self.current_page_number + 1], &[self.current_page_number, self.current_page_number + 1],
area_height, area_height,
); );
} }
pub fn cache_surrounding_pages(&self, area_height: i32) { pub fn cache_surrounding_pages(&self, area_height: i32) {
self.page_cache_sender.send_cache_commands( self.page_cache_sender.send_cache_commands(
&vec![ &[self.current_page_number.saturating_sub(2),
self.current_page_number.saturating_sub(2),
self.current_page_number.saturating_sub(1), self.current_page_number.saturating_sub(1),
self.current_page_number, self.current_page_number,
self.current_page_number + 1, self.current_page_number + 1,
self.current_page_number + 2, self.current_page_number + 2,
self.current_page_number + 3, self.current_page_number + 3],
],
area_height, area_height,
); );
} }