refactor: cleanup parse function

src/elements/block.rs

@@ -1,61 +1,61 @@
 use crate::lines::Lines;
 use memchr::memchr2;
 
-#[cfg_attr(test, derive(PartialEq))]
-#[derive(Debug)]
-pub struct Block;
+// return (name, args, contents-begin, contents-end, end)
+#[inline]
+pub fn parse(src: &str) -> Option<(&str, Option<&str>, usize, usize, usize)> {
+    debug_assert!(src.starts_with("#+"));
 
-impl Block {
-    // return (name, args, contents-begin, contents-end, end)
-    pub fn parse(src: &str) -> Option<(&str, Option<&str>, usize, usize, usize)> {
-        debug_assert!(src.starts_with("#+"));
-
-        if !src[2..8].eq_ignore_ascii_case("BEGIN_") {
-            return None;
-        }
-
-        let name = memchr2(b' ', b'\n', src.as_bytes())
-            .filter(|&i| src.as_bytes()[8..i].iter().all(|c| c.is_ascii_alphabetic()))?;
-        let mut lines = Lines::new(src);
-        let (pre_cont_end, cont_beg, _) = lines.next()?;
-        let args = if pre_cont_end == name {
-            None
-        } else {
-            Some(&src[name..pre_cont_end])
-        };
-        let name = &src[8..name];
-        let end_line = format!(r"#+END_{}", name);
-        let mut pre_end = cont_beg;
-
-        for (_, end, line) in lines {
-            if line.trim().eq_ignore_ascii_case(&end_line) {
-                return Some((name, args, cont_beg, pre_end, end));
-            } else {
-                pre_end = end;
-            }
-        }
-
-        None
+    if src[2..8].to_uppercase() != "BEGIN_" {
+        return None;
     }
+
+    let name = memchr2(b' ', b'\n', src.as_bytes())
+        .filter(|&i| src.as_bytes()[8..i].iter().all(|c| c.is_ascii_alphabetic()))?;
+    let mut lines = Lines::new(src);
+    let (pre_cont_end, cont_beg, _) = lines.next()?;
+    let args = if pre_cont_end == name {
+        None
+    } else {
+        Some(&src[name..pre_cont_end])
+    };
+    let name = &src[8..name];
+    let end_line = format!(r"#+END_{}", name.to_uppercase());
+    let mut pre_end = cont_beg;
+
+    for (_, end, line) in lines {
+        if line.trim() == end_line {
+            return Some((name, args, cont_beg, pre_end, end));
+        } else {
+            pre_end = end;
+        }
+    }
+
+    None
 }
 
-#[test]
-fn parse() {
-    assert_eq!(
-        Block::parse("#+BEGIN_SRC\n#+END_SRC"),
-        Some(("SRC", None, 12, 12, 21))
-    );
-    assert_eq!(
-        Block::parse(
-            r#"#+BEGIN_SRC rust
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn parse() {
+        use super::parse;
+
+        assert_eq!(
+            parse("#+BEGIN_SRC\n#+END_SRC"),
+            Some(("SRC", None, 12, 12, 21))
+        );
+        assert_eq!(
+            parse(
+                r#"#+BEGIN_SRC rust
 fn main() {
     // print "Hello World!" to the console
     println!("Hello World!");
 }
 #+END_SRC
 "#
-        ),
-        Some(("SRC", Some(" rust"), 17, 104, 114))
-    );
-    // TODO: more testing
+            ),
+            Some(("SRC", Some(" rust"), 17, 104, 114))
+        );
+        // TODO: more testing
+    }
 }