From d2d302433747ba04dc2fa541c4da9e878d4a5886 Mon Sep 17 00:00:00 2001 From: Miguel Madrid-MencĂ­a Date: Fri, 27 Jan 2023 16:43:46 +0100 Subject: Fix clippy 1.67 warnings (#5697) --- helix-tui/src/buffer.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'helix-tui/src/buffer.rs') diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs index 9b93c405..b1fd4478 100644 --- a/helix-tui/src/buffer.rs +++ b/helix-tui/src/buffer.rs @@ -433,7 +433,7 @@ impl Buffer { (x_offset as u16, y) } - pub fn set_spans<'a>(&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 @@ impl Buffer { (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 @@ impl Buffer { 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 @@ impl 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 -- cgit v1.2.3-70-g09d2