Update

Author: friendlymatthew

src/grammar.rs

@@ -1,6 +1,5 @@
 #![warn(clippy::nursery)]
 
 mod classifier;
-pub mod grammar;
 pub mod reader;
 mod u8x16;

src/lib.rs

@@ -1,5 +1,5 @@
 use anyhow::anyhow;
-use bitcsv::reader::CsvReader;
+use simdcsv::reader::CsvReader;
 
 fn main() -> anyhow::Result<()> {
     let mut args = std::env::args().skip(1);

src/main.rs

@@ -1,9 +1,11 @@
 use crate::classifier::CsvClassifier;
 use crate::classifier::{COMMA_CLASS, NEW_LINE_CLASS, QUOTATION_CLASS};
-use crate::grammar::Row;
 use crate::u8x16::u8x16;
 use std::ops::Range;
 
+pub type FieldRef = Range<usize>;
+pub type RowRef = Vec<FieldRef>;
+
 /// [`CsvReader`] holds 3 bits per character in the data set.
 /// To understand csv, you only need to know whether a byte is a quotation, comma, new line delimiter, or something else.
 #[derive(Debug)]
@@ -40,7 +42,7 @@ impl CsvReader {
             quotation_bitsets,
         }
     }
-    pub fn read(&mut self) -> Vec<Row> {
+    pub fn read(&mut self) -> Vec<RowRef> {
         let mut rows = Vec::new();
         let mut current_row = Vec::new();
 
@@ -80,7 +82,7 @@ impl CsvReader {
                     current_row.push(Range { start, end });
 
                     if first_new_line < first_comma {
-                        rows.push(Row::from(current_row.clone()));
+                        rows.push(current_row.clone());
                         current_row.clear();
                     }
                 }
@@ -142,8 +144,7 @@ mod tests {
             .read()
             .iter()
             .map(|row| {
-                row.fields()
-                    .iter()
+                row.iter()
                     .map(|range| String::from_utf8(test[range.clone()].to_vec()).unwrap())
                     .collect::<Vec<_>>()
             })