simplify chunks to lines_iter

Author: Noam Lewis

src/chunks.rs renamed to src/lines_iter.rs

@@ -2,32 +2,14 @@ use std::slice::{RSplit, Split};
 
 use crate::LoadedLine;
 
-pub struct Chunk<'a> {
-    file_offset: u64,
-    is_modified: bool,
-    data: &'a [char],
-}
-
-impl Chunk<'_> {
-    pub fn from_disk(file_offset: u64, data: &[char]) -> Chunk {
-        Chunk {
-            file_offset,
-            is_modified: false,
-            data,
-        }
-    }
-
-    pub fn lines_iter(&self) -> ChunkLinesIter {
-        ChunkLinesIter {
-            chunk: self,
-            forward: self.data.split(Box::new(|c: &char| *c == '\n')),
-            back: self.data.rsplit(Box::new(|c: &char| *c == '\n')),
-        }
+pub fn lines_iter<'a>(data: &'a [char]) -> ChunkLinesIter {
+    ChunkLinesIter {
+        forward: data.split(Box::new(|c: &char| *c == '\n')),
+        back: data.rsplit(Box::new(|c: &char| *c == '\n')),
     }
 }
 
 pub struct ChunkLinesIter<'a> {
-    chunk: &'a Chunk<'a>,
     forward: Split<'a, char, Box<dyn FnMut(&char) -> bool>>,
     back: RSplit<'a, char, Box<dyn FnMut(&char) -> bool>>,
 }
@@ -51,13 +33,12 @@ impl<'a> DoubleEndedIterator for ChunkLinesIter<'a> {
 #[cfg(test)]
 mod tests {
 
-    use chunks::Chunk;
+    use super::lines_iter;
 
     #[test]
     fn test_chunk_lines_iter() {
         let data: Vec<char> = "line1\nline2\nline3\n".chars().collect();
-        let chunk = Chunk::from_disk(0, &data);
-        let mut iter = chunk.lines_iter();
+        let mut iter = lines_iter(&data);
 
         assert_eq!(
             iter.next().unwrap().chars_iter().collect::<String>(),
@@ -79,8 +60,7 @@ mod tests {
     #[test]
     fn test_chunk_lines_iter_empty() {
         let data: Vec<char> = "".chars().collect();
-        let chunk = Chunk::from_disk(0, &data);
-        let mut iter = chunk.lines_iter();
+        let mut iter = lines_iter(&data);
 
         assert_eq!(iter.next().unwrap().chars_iter().collect::<String>(), "");
         assert!(iter.next().is_none());
@@ -89,8 +69,7 @@ mod tests {
     #[test]
     fn test_chunk_lines_iter_no_newline() {
         let data: Vec<char> = "line1".chars().collect();
-        let chunk = Chunk::from_disk(0, &data);
-        let mut iter = chunk.lines_iter();
+        let mut iter = lines_iter(&data);
 
         assert_eq!(
             iter.next().unwrap().chars_iter().collect::<String>(),
@@ -102,8 +81,7 @@ mod tests {
     #[test]
     fn test_chunk_lines_iter_double_ended() {
         let data: Vec<char> = "line1\nline2\nline3\n".chars().collect();
-        let chunk = Chunk::from_disk(0, &data);
-        let mut iter = chunk.lines_iter();
+        let mut iter = lines_iter(&data);
 
         assert_eq!(
             iter.next_back().unwrap().chars_iter().collect::<String>(),

src/main.rs

@@ -15,8 +15,8 @@ use ratatui::{
     DefaultTerminal, Frame,
 };
 
-pub mod chunks;
 pub mod lines;
+pub mod lines_iter;
 
 // TODO
 // How to represent edited content?