diff --git a/crates/core/src/document/mod.rs b/crates/core/src/document/mod.rs index f59c1de8..a6c895d8 100644 --- a/crates/core/src/document/mod.rs +++ b/crates/core/src/document/mod.rs @@ -557,7 +557,7 @@ pub fn sys_info_as_html() -> String { buf.push_str("\t\t\t\n"); let output = Command::new("/bin/ntx_hwconfig") - .args(&["-s", "/dev/mmcblk0"]) + .args(["-s", "/dev/mmcblk0"]) .output() .map_err(|e| eprintln!("Can't execute command: {:#}.", e)) .ok(); diff --git a/crates/core/src/library.rs b/crates/core/src/library.rs index db93da6a..bf242896 100644 --- a/crates/core/src/library.rs +++ b/crates/core/src/library.rs @@ -186,7 +186,7 @@ impl Library { continue; } - let kind = file_kind(&path).unwrap_or_default(); + let kind = file_kind(path).unwrap_or_default(); let md = entry.metadata().unwrap(); let size = md.len(); let fp = md.fingerprint(self.fat32_epoch).unwrap(); @@ -303,7 +303,7 @@ impl Library { } // We found a new file: add it to the db. } else { - let kind = file_kind(&path).unwrap_or_default(); + let kind = file_kind(path).unwrap_or_default(); if !settings.allowed_kinds.contains(&kind) { continue; } diff --git a/crates/core/src/view/calculator/code_area.rs b/crates/core/src/view/calculator/code_area.rs index faba2098..3fd20db0 100644 --- a/crates/core/src/view/calculator/code_area.rs +++ b/crates/core/src/view/calculator/code_area.rs @@ -123,7 +123,7 @@ impl View for CodeArea { x = self.rect.min.x + padding; } if y >= rect.min.y { - let plan = font.plan(&c.to_string(), None, None); + let plan = font.plan(c.to_string(), None, None); font.render(fb, TEXT_NORMAL[1], &plan, pt!(x, y)); } x += char_width; diff --git a/crates/core/src/view/clock.rs b/crates/core/src/view/clock.rs index 55eefb88..8e4f5618 100644 --- a/crates/core/src/view/clock.rs +++ b/crates/core/src/view/clock.rs @@ -21,7 +21,7 @@ impl Clock { let time = Local::now(); let format = context.settings.time_format.clone(); let font = font_from_style(&mut context.fonts, &NORMAL_STYLE, CURRENT_DEVICE.dpi); - let width = font.plan(&time.format(&format).to_string(), None, None).width + font.em() as i32; + let width = font.plan(time.format(&format).to_string(), None, None).width + font.em() as i32; rect.min.x = rect.max.x - width; Clock { id: ID_FEEDER.next(), @@ -56,7 +56,7 @@ impl View for Clock { fn render(&self, fb: &mut dyn Framebuffer, _rect: Rectangle, fonts: &mut Fonts) { let dpi = CURRENT_DEVICE.dpi; let font = font_from_style(fonts, &NORMAL_STYLE, dpi); - let plan = font.plan(&self.time.format(&self.format).to_string(), None, None); + let plan = font.plan(self.time.format(&self.format).to_string(), None, None); let dx = (self.rect.width() as i32 - plan.width) / 2; let dy = (self.rect.height() as i32 - font.x_heights.0 as i32) / 2; let pt = pt!(self.rect.min.x + dx, self.rect.max.y - dy); diff --git a/crates/core/src/view/home/library_label.rs b/crates/core/src/view/home/library_label.rs index ecdc9ac6..ab03b4d8 100644 --- a/crates/core/src/view/home/library_label.rs +++ b/crates/core/src/view/home/library_label.rs @@ -87,7 +87,7 @@ impl View for LibraryLabel { let font = font_from_style(fonts, &NORMAL_STYLE, dpi); let padding = font.em() as i32 / 2; let max_width = self.rect.width().saturating_sub(2 * padding as u32) as i32; - let plan = font.plan(&self.text(), Some(max_width), None); + let plan = font.plan(self.text(), Some(max_width), None); let dx = padding + (max_width - plan.width) / 2; let dy = (self.rect.height() as i32 - font.x_heights.0 as i32) / 2; let pt = pt!(self.rect.min.x + dx, self.rect.max.y - dy); diff --git a/crates/core/src/view/icon.rs b/crates/core/src/view/icon.rs index ddd3e692..f0efdda2 100644 --- a/crates/core/src/view/icon.rs +++ b/crates/core/src/view/icon.rs @@ -28,7 +28,7 @@ lazy_static! { "arrow-left", "arrow-right", "angle-down", "angle-up", "crop", "toc", "font_family", "font_size", "line_height", "align-justify", "align-left", "align-right", "align-center", "margin", "plug", "cover", "enclosed_menu", "contrast", "gray"].iter().cloned() { - let path = dir.join(&format!("{}.svg", name)); + let path = dir.join(format!("{}.svg", name)); let doc = PdfOpener::new().and_then(|o| o.open(path)).unwrap(); let pixmap = doc.page(0).and_then(|p| p.pixmap(scale, 1)).unwrap(); m.insert(name, pixmap); diff --git a/crates/core/src/view/key.rs b/crates/core/src/view/key.rs index 2aacca12..a5069b44 100644 --- a/crates/core/src/view/key.rs +++ b/crates/core/src/view/key.rs @@ -221,7 +221,7 @@ impl View for Key { match self.kind.label(ratio) { KeyLabel::Char(ch) => { let font = font_from_style(fonts, &KBD_CHAR, dpi); - let plan = font.plan(&ch.to_string(), None, None); + let plan = font.plan(ch.to_string(), None, None); let dx = (self.rect.width() as i32 - plan.width) / 2; let dy = (self.rect.height() - font.x_heights.0) as i32 / 2; let pt = pt!(self.rect.min.x + dx, self.rect.max.y - dy); diff --git a/crates/core/src/view/named_input.rs b/crates/core/src/view/named_input.rs index 894a62dd..efcdc063 100644 --- a/crates/core/src/view/named_input.rs +++ b/crates/core/src/view/named_input.rs @@ -32,7 +32,7 @@ impl NamedInput { let padding = font.em() as i32; let mut label_width = font.plan(&text, None, None).width; - let mut input_width = font.plan(&"0".repeat(input_size), None, None).width; + let mut input_width = font.plan("0".repeat(input_size), None, None).width; let mut total_width = 5 * padding + label_width + input_width; let delta = width as i32 - total_width; diff --git a/crates/core/src/view/page_label.rs b/crates/core/src/view/page_label.rs index 7d4ab4b7..079dc823 100644 --- a/crates/core/src/view/page_label.rs +++ b/crates/core/src/view/page_label.rs @@ -87,12 +87,12 @@ impl View for PageLabel { let font = font_from_style(fonts, &NORMAL_STYLE, dpi); let padding = font.em() as i32 / 2; let max_width = self.rect.width().saturating_sub(2 * padding as u32) as i32; - let mut plan = font.plan(&self.text(0), None, None); + let mut plan = font.plan(self.text(0), None, None); for size in 1..=4 { if plan.width <= max_width { break; } - plan = font.plan(&self.text(size), None, None); + plan = font.plan(self.text(size), None, None); } font.crop_right(&mut plan, max_width); let dx = padding + (max_width - plan.width) / 2; diff --git a/crates/core/src/view/presets_list.rs b/crates/core/src/view/presets_list.rs index 38299853..838f4d38 100644 --- a/crates/core/src/view/presets_list.rs +++ b/crates/core/src/view/presets_list.rs @@ -32,7 +32,7 @@ impl PresetsList { let x_height = font.x_heights.0 as i32; let preset_height = 4 * x_height; let padding = font.em() as i32; - let preset_width = font.plan(&presets[0].name(), None, None).width + padding; + let preset_width = font.plan(presets[0].name(), None, None).width + padding; let max_per_line = (self.rect.width() as i32 + padding) / (preset_width + padding); self.pages.clear(); diff --git a/crates/core/src/view/reader/chapter_label.rs b/crates/core/src/view/reader/chapter_label.rs index c53c4d3f..77cb8cd9 100644 --- a/crates/core/src/view/reader/chapter_label.rs +++ b/crates/core/src/view/reader/chapter_label.rs @@ -62,7 +62,7 @@ impl View for ChapterLabel { let padding = font.em() as i32 / 2; let max_width = self.rect.width().saturating_sub(2 * padding as u32) as i32; let max_progress_width = max_width - font.ellipsis.width; - let progress_plan = font.plan(&format!(" ({:.1}%)", 100.0 * self.progress), + let progress_plan = font.plan(format!(" ({:.1}%)", 100.0 * self.progress), Some(max_progress_width), None); let max_title_width = max_width - progress_plan.width; diff --git a/crates/core/src/view/reader/results_label.rs b/crates/core/src/view/reader/results_label.rs index 25e0891c..0930b3b4 100644 --- a/crates/core/src/view/reader/results_label.rs +++ b/crates/core/src/view/reader/results_label.rs @@ -63,7 +63,7 @@ impl View for ResultsLabel { let font = font_from_style(fonts, &NORMAL_STYLE, dpi); let padding = font.em() as i32 / 2; let max_width = self.rect.width().saturating_sub(2 * padding as u32) as i32; - let plan = font.plan(&self.text(), Some(max_width), None); + let plan = font.plan(self.text(), Some(max_width), None); let dx = padding + (max_width - plan.width) / 2; let dy = (self.rect.height() as i32 - font.x_heights.0 as i32) / 2; let pt = pt!(self.rect.min.x + dx, self.rect.max.y - dy); diff --git a/crates/core/src/view/slider.rs b/crates/core/src/view/slider.rs index 4b789e39..5ceca52f 100644 --- a/crates/core/src/view/slider.rs +++ b/crates/core/src/view/slider.rs @@ -132,7 +132,7 @@ impl View for Slider { &fill_color); let font = font_from_style(fonts, &SLIDER_VALUE, dpi); - let plan = font.plan(&format!("{:.1}", self.value), None, None); + let plan = font.plan(format!("{:.1}", self.value), None, None); let x_height = font.x_heights.1 as i32; let x_drift = if self.value > (self.min_value + self.max_value) / 2.0 { diff --git a/crates/fetcher/src/main.rs b/crates/fetcher/src/main.rs index 6a1b28ee..10c9dc80 100644 --- a/crates/fetcher/src/main.rs +++ b/crates/fetcher/src/main.rs @@ -406,7 +406,7 @@ fn main() -> Result<(), Error> { session.since = updated_at.timestamp(); - let epub_path = save_path.join(&format!("{}.epub", id)); + let epub_path = save_path.join(format!("{}.epub", id)); if epub_path.exists() { continue; } diff --git a/crates/importer/src/main.rs b/crates/importer/src/main.rs index 3ebcc058..fa5a7f21 100644 --- a/crates/importer/src/main.rs +++ b/crates/importer/src/main.rs @@ -64,7 +64,7 @@ fn main() -> Result<(), Error> { } }).unwrap_or(LibraryMode::Database); - let mut library = Library::new(&library_path, mode)?; + let mut library = Library::new(library_path, mode)?; if matches.opt_present("I") { library.import(&import_settings);