From a2ca10643f744244c635fb9b41a3c742e35213ea Mon Sep 17 00:00:00 2001
From: Joe Wilm <joe@jwilm.com>
Date: Fri, 1 Jul 2016 21:13:09 -0700
Subject: Implement Term::erase_chars

Fixes last known issue with htop. I think this implementation might not
be correct, but I don't yet understand the difference between erasing
and deleting (I imagine it's the difference between graphics state vs
grid state). Will probably need to circle back here.

Adds all range indexing operations to rows. Some were needed for the
erase_chars impl, and the rest are there for fully generality.
---
 src/grid.rs | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'src/grid.rs')

diff --git a/src/grid.rs b/src/grid.rs
index c3f4785a..3ce15280 100644
--- a/src/grid.rs
+++ b/src/grid.rs
@@ -14,7 +14,7 @@
 //
 //! Functions for computing properties of the terminal grid
 
-use std::ops::{Index, IndexMut, Deref, DerefMut, Range, RangeTo, RangeFrom};
+use std::ops::{Index, IndexMut, Deref, DerefMut, Range, RangeTo, RangeFrom, RangeFull};
 use std::cmp::Ordering;
 use std::slice::{Iter, IterMut};
 
@@ -262,35 +262,29 @@ impl IndexMut<usize> for Row {
     }
 }
 
-impl Index<RangeFrom<usize>> for Row {
-    type Output = [Cell];
-    #[inline]
-    fn index<'a>(&'a self, index: RangeFrom<usize>) -> &'a [Cell] {
-        &self.0[index]
-    }
-}
-
-impl IndexMut<RangeFrom<usize>> for Row {
-    #[inline]
-    fn index_mut<'a>(&'a mut self, index: RangeFrom<usize>) -> &'a mut [Cell] {
-        &mut self.0[index]
-    }
-}
+macro_rules! row_index_range {
+    ($range:ty) => {
+        impl Index<$range> for Row {
+            type Output = [Cell];
+            #[inline]
+            fn index<'a>(&'a self, index: $range) -> &'a [Cell] {
+                &self.0[index]
+            }
+        }
 
-impl Index<RangeTo<usize>> for Row {
-    type Output = [Cell];
-    #[inline]
-    fn index<'a>(&'a self, index: RangeTo<usize>) -> &'a [Cell] {
-        &self.0[index]
+        impl IndexMut<$range> for Row {
+            #[inline]
+            fn index_mut<'a>(&'a mut self, index: $range) -> &'a mut [Cell] {
+                &mut self.0[index]
+            }
+        }
     }
 }
 
-impl IndexMut<RangeTo<usize>> for Row {
-    #[inline]
-    fn index_mut<'a>(&'a mut self, index: RangeTo<usize>) -> &'a mut [Cell] {
-        &mut self.0[index]
-    }
-}
+row_index_range!(Range<usize>);
+row_index_range!(RangeTo<usize>);
+row_index_range!(RangeFrom<usize>);
+row_index_range!(RangeFull);
 
 pub trait ClearRegion<T> {
     fn clear_region(&mut self, region: T);
-- 
cgit v1.2.3-54-g00ecf