diff --git a/helix-loader/src/config.rs b/helix-loader/src/config.rs index a4c6dcbde..0f329d217 100644 --- a/helix-loader/src/config.rs +++ b/helix-loader/src/config.rs @@ -14,7 +14,7 @@ pub fn user_lang_config() -> Result { .chain([crate::config_dir()].into_iter()) .map(|path| path.join("languages.toml")) .filter_map(|file| { - std::fs::read_to_string(&file) + std::fs::read_to_string(file) .map(|config| toml::from_str(&config)) .ok() }) diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs index 2aa924755..01c966c8c 100644 --- a/helix-loader/src/grammar.rs +++ b/helix-loader/src/grammar.rs @@ -515,5 +515,5 @@ pub fn load_runtime_file(language: &str, filename: &str) -> Result(&mut self, x: u16, y: u16, spans: &Spans<'a>, width: u16) -> (u16, u16) { + pub fn set_spans(&mut self, x: u16, y: u16, spans: &Spans, width: u16) -> (u16, u16) { let mut remaining_width = width; let mut x = x; for span in &spans.0 { @@ -454,7 +454,7 @@ pub fn set_spans<'a>(&mut self, x: u16, y: u16, spans: &Spans<'a>, width: u16) - (x, y) } - pub fn set_span<'a>(&mut self, x: u16, y: u16, span: &Span<'a>, width: u16) -> (u16, u16) { + pub fn set_span(&mut self, x: u16, y: u16, span: &Span, width: u16) -> (u16, u16) { self.set_stringn(x, y, span.content.as_ref(), width as usize, span.style) } @@ -521,10 +521,10 @@ pub fn clear_with(&mut self, area: Rect, style: Style) { pub fn merge(&mut self, other: &Buffer) { let area = self.area.union(other.area); let cell: Cell = Default::default(); - self.content.resize(area.area() as usize, cell.clone()); + self.content.resize(area.area(), cell.clone()); // Move original content to the appropriate space - let size = self.area.area() as usize; + let size = self.area.area(); for i in (0..size).rev() { let (x, y) = self.pos_of(i); // New index in content @@ -537,7 +537,7 @@ pub fn merge(&mut self, other: &Buffer) { // Push content of the other buffer into this one (may erase previous // data) - let size = other.area.area() as usize; + let size = other.area.area(); for i in 0..size { let (x, y) = other.pos_of(i); // New index in content diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs index 43d4a7a71..8fb15a101 100644 --- a/helix-view/src/theme.rs +++ b/helix-view/src/theme.rs @@ -150,7 +150,7 @@ fn merge_themes(&self, parent_theme_toml: Value, theme_toml: Value) -> Value { // Loads the theme data as `toml::Value` first from the user_dir then in default_dir fn load_toml(&self, path: PathBuf) -> Result { - let data = std::fs::read_to_string(&path)?; + let data = std::fs::read_to_string(path)?; let value = toml::from_str(&data)?; Ok(value)