Merge branch 'fix' into 'main'

fix: drop unwanted empty lines from output

See merge request larswirzenius/summain!17

2 files changed, 1 insertions, 7 deletions

diff --git a/src/bin/summain.rs b/src/bin/summain.rs
index 20ca738..a2e2b7a 100644
--- a/src/bin/summain.rs
+++ b/src/bin/summain.rs
@@ -11,7 +11,7 @@ fn main() -> anyhow::Result<()> {
         opt.pathnames.par_iter().map(|p| manifest(&p)).collect();
     for m in v {
         let m = m?;
-        println!("{}", serde_yaml::to_string(&m)?);
+        print!("{}", serde_yaml::to_string(&m)?);
     }
     Ok(())
 }
diff --git a/subplot/summain.py b/subplot/summain.py
index 0a53b08..4bde65c 100644
--- a/subplot/summain.py
+++ b/subplot/summain.py
@@ -54,12 +54,6 @@ def output_matches_file(ctx, filename=None):
     actual = runcmd_get_stdout(ctx)
     expected = get_file(filename).decode("UTF-8")
 
-    # For some reason, in CI actual has an extra newline at the end. I have
-    # failed to find why. As a workaround, stripping it here.
-    if actual.endswith("\n\n"):
-        print("FIXME: stripping extra newline from actual output")
-        actual = actual[:-1]
-
     diff = "".join(
         line.rstrip("\n") + "\n"
         for line in difflib.unified_diff(