incremental_reader: operate on strings, not lists of lines

MercuryTechnologies · Sep 11, 2023 · 79e7ac2 · 79e7ac2
1 parent 9b7354a
commit 79e7ac2
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ghcid-ng/Cargo.toml b/ghcid-ng/Cargo.toml
@@ -22,6 +22,7 @@ camino = "1.1.4"
 clap = { version = "4.3.2", features = ["derive", "wrap_help", "env"] }
 humantime = "2.1.0"
 itertools = "0.11.0"
+line-span = "0.1.5"
 miette = { version = "5.9.0", features = ["fancy"] }
 nix = { version = "0.26.2", default_features = false, features = ["process"] }
 once_cell = "1.18.0"

diff --git a/ghcid-ng/src/ghci/parse/module_set.rs b/ghcid-ng/src/ghci/parse/module_set.rs
@@ -49,7 +49,6 @@ impl ModuleSet {
     /// Determine if a module with the given source path is contained in this module set.
     ///
     /// Returns `Err` if the `path` cannot be canonicalized.
-    #[allow(dead_code)]
     pub fn contains_source_path(&self, path: &Utf8Path) -> miette::Result<bool> {
         Ok(self.map.contains(&canonicalize(path)?))
     }

diff --git a/ghcid-ng/src/ghci/stdout.rs b/ghcid-ng/src/ghci/stdout.rs
@@ -13,7 +13,6 @@ use tracing::instrument;
 use crate::aho_corasick::AhoCorasickExt;
 use crate::incremental_reader::IncrementalReader;
 use crate::incremental_reader::WriteBehavior;
-use crate::lines::Lines;
 use crate::sync_sentinel::SyncSentinel;
 
 use super::parse::ModuleSet;
@@ -44,11 +43,11 @@ impl GhciStdout {
             "GHCJSi, version ",
             "Clashi, version ",
         ]);
-        let lines = self
+        let data = self
             .reader
             .read_until(&bootup_patterns, WriteBehavior::Write, &mut self.buffer)
             .await?;
-        tracing::debug!(?lines, "ghci started, saw version marker");
+        tracing::debug!(data, "ghci started, saw version marker");
 
         // We know that we'll get _one_ `ghci> ` prompt on startup.
         let init_prompt_patterns = AhoCorasick::from_anchored_patterns(["ghci> "]);
@@ -69,20 +68,20 @@ impl GhciStdout {
         prompt_patterns: Option<&AhoCorasick>,
     ) -> miette::Result<Option<CompilationResult>> {
         let prompt_patterns = prompt_patterns.unwrap_or(&self.prompt_patterns);
-        let lines = self
+        let data = self
             .reader
             .read_until(
                 prompt_patterns,
                 WriteBehavior::NoFinalLine,
                 &mut self.buffer,
             )
             .await?;
-        tracing::debug!(lines = lines.len(), "Got data from ghci");
+        tracing::debug!(bytes = data.len(), "Got data from ghci");
 
         let mut result = None;
         if self.mode == Mode::Compiling {
             result = self
-                .get_status_from_compile_output(lines)
+                .get_status_from_compile_output(data.lines().last())
                 .await
                 .wrap_err("Failed to get status from compilation output")?;
         }
@@ -104,7 +103,7 @@ impl GhciStdout {
     pub async fn sync(&mut self, sentinel: SyncSentinel) -> miette::Result<()> {
         // Read until the sync marker...
         let sync_pattern = AhoCorasick::from_anchored_patterns([sentinel.to_string()]);
-        let lines = self
+        let data = self
             .reader
             .read_until(&sync_pattern, WriteBehavior::NoFinalLine, &mut self.buffer)
             .await?;
@@ -113,7 +112,7 @@ impl GhciStdout {
             .reader
             .read_until(&self.prompt_patterns, WriteBehavior::Hide, &mut self.buffer)
             .await?;
-        tracing::debug!(?lines, "Got data from ghci");
+        tracing::debug!(data, "Synced with ghci");
 
         // Tell the stderr stream to write the error log and then finish.
         let (err_sender, err_receiver) = oneshot::channel();
@@ -133,7 +132,7 @@ impl GhciStdout {
             .reader
             .read_until(&self.prompt_patterns, WriteBehavior::Hide, &mut self.buffer)
             .await?;
-        ModuleSet::from_lines(&lines.join("\n"))
+        ModuleSet::from_lines(&lines)
     }
 
     #[instrument(skip(self), level = "debug")]
@@ -148,10 +147,10 @@ impl GhciStdout {
     /// compilation status.
     async fn get_status_from_compile_output(
         &mut self,
-        mut lines: Lines,
+        last_line: Option<&str>,
     ) -> miette::Result<Option<CompilationResult>> {
-        if let Some(line) = lines.pop() {
-            if compilation_finished_re().is_match(&line) {
+        if let Some(line) = last_line {
+            if compilation_finished_re().is_match(line) {
                 let result = if line.starts_with("Ok") {
                     tracing::debug!("Compilation succeeded");
                     CompilationResult::Ok
@@ -163,7 +162,7 @@ impl GhciStdout {
                 let (sender, receiver) = oneshot::channel();
                 self.stderr_sender
                     .send(StderrEvent::SetCompilationSummary {
-                        summary: line,
+                        summary: line.to_owned(),
                         sender,
                     })
                     .await