Revert "Fix usage of split_inclusive in event parser (#31)"

This reverts commit 08a3496.

Author: keelerm84

.circleci/config.yml

@@ -2,14 +2,18 @@ version: 2
 jobs:
   build:
     docker:
-      - image: cimg/rust:1.59.0
+      - image: circleci/rust:latest
+
     steps:
       - checkout
+
       - run:
-          name: Check Version
-          command: |
-            cargo --version
-            rustc --version
+          name: Install clippy
+          command: rustup component add clippy
+      - run:
+          name: Install rustfmt
+          command: rustup component add rustfmt
+
       - run:
           name: Check consistent formatting
           command: cargo fmt && git diff --exit-code

eventsource-client/Cargo.toml

@@ -27,8 +27,6 @@ maplit = "1.0.1"
 simplelog = "0.5.3"
 tokio = { version = "1.2.0", features = ["macros", "rt-multi-thread"] }
 test-case = "1.2.3"
-proptest = "1.0.0"
-
 
 [features]
 default = ["rustls"]

eventsource-client/src/event_parser.rs

@@ -309,43 +309,34 @@ impl EventParser {
         //  * the first line should be appended to the incomplete line, if any
 
         if let Some(incomplete_line) = self.incomplete_line.as_mut() {
-            trace!("incomplete_line {:?}", incomplete_line);
-            if let Some(line) = lines.next() {
-                trace!(
-                    "extending line from previous chunk: {:?}+{:?}",
-                    logify(incomplete_line),
-                    logify(line)
-                );
+            let line = lines
+                .next()
+                // split always returns at least one item
+                .unwrap();
+            trace!(
+                "extending line from previous chunk: {:?}+{:?}",
+                logify(incomplete_line),
+                logify(line)
+            );
 
-                self.last_char_was_cr = false;
-                if !line.is_empty() {
-                    // Checking the last character handles lines where the last character is a
-                    // terminator, but also where the entire line is a terminator.
-                    match line.last().unwrap() {
-                        b'\r' => {
-                            trace!("\\r branch");
-                            incomplete_line.extend_from_slice(&line[..line.len() - 1]);
-                            let il = self.incomplete_line.take();
-                            self.complete_lines.push_back(il.unwrap());
-                            self.last_char_was_cr = true;
-                        }
-                        b'\n' => {
-                            trace!("\\n branch");
-                            incomplete_line.extend_from_slice(&line[..line.len() - 1]);
-                            let il = self.incomplete_line.take();
-                            self.complete_lines.push_back(il.unwrap());
-                        }
-                        _ => {
-                            trace!(
-                                "other branch, extending slice {:?} with {:?}",
-                                incomplete_line,
-                                line
-                            );
-                            incomplete_line.extend_from_slice(line);
-                            trace!("Now we have {:?}", incomplete_line);
-                        }
-                    };
-                }
+            self.last_char_was_cr = false;
+            if !line.is_empty() {
+                // Checking the last character handles lines where the last character is a
+                // terminator, but also where the entire line is a terminator.
+                match line.last().unwrap() {
+                    b'\r' => {
+                        incomplete_line.extend_from_slice(&line[..line.len() - 1]);
+                        let il = self.incomplete_line.take();
+                        self.complete_lines.push_back(il.unwrap());
+                        self.last_char_was_cr = true;
+                    }
+                    b'\n' => {
+                        incomplete_line.extend_from_slice(&line[..line.len() - 1]);
+                        let il = self.incomplete_line.take();
+                        self.complete_lines.push_back(il.unwrap());
+                    }
+                    _ => incomplete_line.extend_from_slice(line),
+                };
             }
         }
 
@@ -406,7 +397,6 @@ impl EventParser {
 #[cfg(test)]
 mod tests {
     use super::{Error::*, *};
-    use proptest::proptest;
     use test_case::test_case;
 
     fn field<'a>(key: &'a str, value: &'a str) -> Result<Option<(&'a str, &'a str)>> {
@@ -703,13 +693,4 @@ mod tests {
         std::fs::read(format!("test-data/{}", name))
             .unwrap_or_else(|_| panic!("couldn't read {}", name))
     }
-
-    proptest! {
-        #[test]
-        fn test_decode_and_buffer_lines_does_not_crash(next in "(\r\n|\r|\n)*event: [^\n\r:]*(\r\n|\r|\n)", previous in "(\r\n|\r|\n)*event: [^\n\r:]*(\r\n|\r|\n)") {
-            let mut parser = EventParser::new();
-            parser.incomplete_line = Some(previous.as_bytes().to_vec());
-            parser.decode_and_buffer_lines(Bytes::from(next));
-        }
-    }
 }