Merge branch 'main' of github.com:foxfriends/trilogy

Author: foxfriends

Justfile

@@ -35,7 +35,7 @@ testsuite:
 
 run file="main.tri":
     cargo run -- compile {{file}} > main.ll
-    {{clang}} main.ll -g -ldl -no-pie -fno-pie -fdebug-macro -O0 -rdynamic
+    {{clang}} main.ll -g -ldl -fdebug-macro -O0 -rdynamic
     ./a.out
 
 trace file="main.tri":

trilogy/test.rs

@@ -175,14 +175,12 @@ impl Report {
             if program_output.stderr.is_empty() {
                 writeln!(stdout, "expected error output")?;
             }
-        } else {
-            if !program_output.stderr.is_empty() {
-                writeln!(
-                    stdout,
-                    "---- unexpected error output ----\n{}",
-                    std::str::from_utf8(&program_output.stderr).unwrap_or("non UTF-8 output"),
-                )?;
-            }
+        } else if !program_output.stderr.is_empty() {
+            writeln!(
+                stdout,
+                "---- unexpected error output ----\n{}",
+                std::str::from_utf8(&program_output.stderr).unwrap_or("non UTF-8 output"),
+            )?;
         }
 
         Ok(())