cleanup(record): remove unnecessary lifetimes from Component::draw

arxanas · Feb 28, 2023 · c3a6bf6 · c3a6bf6
1 parent c6f68d8
commit c3a6bf6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/scm-record/src/render.rs b/scm-record/src/render.rs
@@ -391,9 +391,9 @@ pub(crate) trait Component: Sized {
     /// was drawn.
     type Id: Clone + Debug + Eq + Hash;
 
-    /// Get the ID for this compoent.
+    /// Get the ID for this component.
     fn id(&self) -> Self::Id;
 
     /// Draw this component and any child components.
-    fn draw<'a, 'b: 'a>(&'b self, viewport: &'a mut Viewport<Self::Id>, x: isize, y: isize);
+    fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize);
 }
diff --git a/scm-record/src/ui.rs b/scm-record/src/ui.rs
@@ -931,7 +931,7 @@ impl<Id: Clone + Debug + Eq + Hash> Component for TristateBox<Id> {
         self.id.clone()
     }
 
-    fn draw<'a, 'b: 'a>(&'b self, viewport: &'a mut Viewport<Self::Id>, x: isize, y: isize) {
+    fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize) {
         let span = Span::styled(self.text(), Style::default().add_modifier(Modifier::BOLD));
         viewport.draw_span(x, y, &span);
     }
@@ -971,7 +971,7 @@ impl Component for App<'_> {
         ComponentId::App
     }
 
-    fn draw<'a, 'b: 'a>(&'b self, viewport: &'a mut Viewport<Self::Id>, x: isize, y: isize) {
+    fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize) {
         let Self {
             debug_info,
             file_views,
@@ -1023,7 +1023,7 @@ impl Component for FileView<'_> {
         ComponentId::SelectableItem(SelectionKey::File(self.file_key))
     }
 
-    fn draw<'a, 'b: 'a>(&'b self, viewport: &'a mut Viewport<Self::Id>, x: isize, y: isize) {
+    fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize) {
         let Self {
             debug,
             file_key: _,
@@ -1099,7 +1099,7 @@ impl Component for SectionView<'_> {
         ComponentId::SelectableItem(SelectionKey::Section(self.section_key))
     }
 
-    fn draw<'a, 'b: 'a>(&'b self, viewport: &'a mut Viewport<Self::Id>, x: isize, y: isize) {
+    fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize) {
         let Self {
             use_unicode,
             section_key,
@@ -1232,7 +1232,7 @@ impl Component for SectionLineView<'_> {
         ComponentId::SelectableItem(SelectionKey::Line(self.line_key))
     }
 
-    fn draw<'a, 'b: 'a>(&'b self, viewport: &'a mut Viewport<Self::Id>, x: isize, y: isize) {
+    fn draw(&self, viewport: &mut Viewport<Self::Id>, x: isize, y: isize) {
         let Self { line_key: _, inner } = self;
         match inner {
             SectionLineViewInner::Unchanged { line } => {