exit

dezren39 · dezren39 · commit 3286ca292ff5 · 2025-07-09T03:59:56.000-05:00
diff --git a/pkgs/roc/applications/display/go-basic-cli/main.roc b/pkgs/roc/applications/display/go-basic-cli/main.roc
@@ -2,6 +2,5 @@ app [main] {
     pf: platform "./Platform/main.roc",
     lib: "./Lib/main.roc",
 }
-import lib.Display exposing [str, matrix]
-main : Str
-main = str(matrix [261, 23])
+import lib.Display exposing [to_str, matrix]
+main = to_str(matrix [261, 23])
diff --git a/pkgs/roc/applications/hello/go-basic-cli/main.roc b/pkgs/roc/applications/hello/go-basic-cli/main.roc
@@ -2,6 +2,5 @@ app [main] {
     pf: platform "./Platform/main.roc",
     lib: "./Lib/main.roc",
 }
-import lib.Hello
-main : Str
-main = Hello.str "Go"
+import lib.Hello exposing [hello]
+main = hello "Go"
diff --git a/pkgs/roc/applications/hello/rust-basic-cli-template/main.roc b/pkgs/roc/applications/hello/rust-basic-cli-template/main.roc
@@ -2,11 +2,10 @@ app [main!] {
     pf: platform "./Platform/main.roc",
     lib: "./Lib/main.roc",
 }
-import lib.Hello
-import pf.Stdout
+import lib.Hello exposing [hello]
+import pf.Stdout exposing [line!]
 language = "Rust"
-main! : {} => Result {} _
-main! = |{}|
-    Stdout.line!(Hello.str language)?
-    Stdout.line!(Str.join_with(["Roc ❤️", language], "  "))?
+main! = |_|
+    line!(hello language)?
+    line!("Roc ❤️  ${language}")?
     Ok({})
diff --git a/pkgs/roc/applications/hello/rust-basic-cli/main.roc b/pkgs/roc/applications/hello/rust-basic-cli/main.roc
@@ -2,11 +2,10 @@ app [main!] {
     pf: platform "./Platform/main.roc",
     lib: "./Lib/main.roc",
 }
-import lib.Hello
-import pf.Stdout
+import lib.Hello exposing [hello]
+import pf.Stdout exposing [line!]
 language = "Rust"
-main! : {} => Result {} _
-main! = |{}|
-    Stdout.line!(Hello.str language)?
-    Stdout.line!(Str.join_with(["Roc ❤️", language], "  "))?
+main! = |_|
+    line!(hello language)?
+    line!("Roc ❤️  ${language}")?
     Ok({})
diff --git a/pkgs/roc/applications/hello/rust-minimal-cli/Lib b/pkgs/roc/applications/hello/rust-minimal-cli/Lib
@@ -0,0 +1 @@
+../../../lib
diff --git a/pkgs/roc/applications/hello/rust-minimal-cli/main.roc b/pkgs/roc/applications/hello/rust-minimal-cli/main.roc
@@ -10,4 +10,4 @@ main! = |_|
     line!(hello language)?
     line!("Roc ❤️  ${language}")?
     line!(hello!(user)?)?
-    Ok
+    Ok({})
diff --git a/pkgs/roc/lib/Display.roc b/pkgs/roc/lib/Display.roc
@@ -1,6 +1,6 @@
-module [str, matrix]
-str : List (List Str) -> Str
-str = |lines|
+module [to_str, matrix]
+to_str : List (List Str) -> Str
+to_str = |lines|
     lines
     |> List.map (|ws| Str.join_with(ws, "\t"))
     |> Str.join_with("\n")
diff --git a/pkgs/roc/lib/Hello.roc b/pkgs/roc/lib/Hello.roc
@@ -1,15 +1,10 @@
-module [str]
-import Square exposing [f64]
-num : F64
+module [hello]
+import Square exposing [square]
 num = 8192.0125
-str : Str -> Str
-str = |language|
-    Str.join_with(
-        [
-            Str.join_with(["Roc loves", language], " "),
-            Str.join_with([Num.to_str(num), "^2=", Num.to_str(f64(num))], ""),
-            Str.join_with(["This is a Roc application running on ", language, "."], ""),
-            "It imports a Roc module and calls a function from it.",
-        ],
-        "\n",
-    )
+hello = |language|
+    """
+    Roc loves ${language}
+    ${Num.to_str(num)}^2=${Num.to_str(square(num))}
+    This is a Roc application running on ${language}.
+    It imports a Roc module and calls a function from it.
+    """
diff --git a/pkgs/roc/lib/Square.roc b/pkgs/roc/lib/Square.roc
@@ -1,7 +1,2 @@
-module [i128, i64, f64]
-i128 : I128 -> I128
-i128 = |x| x * x
-i64 : I64 -> I64
-i64 = |x| x * x
-f64 : F64 -> F64
-f64 = |x| x * x
+module [square]
+square = |x| x * x
diff --git a/pkgs/roc/platforms/go-basic-cli/metadata_linux-x64.rm b/pkgs/roc/platforms/go-basic-cli/metadata_linux-x64.rm
diff --git a/pkgs/roc/platforms/rust-minimal-cli/build b/pkgs/roc/platforms/rust-minimal-cli/build
diff --git a/pkgs/roc/platforms/rust-minimal-cli/crates/roc_host/src/lib.rs b/pkgs/roc/platforms/rust-minimal-cli/crates/roc_host/src/lib.rs
@@ -1,6 +1,7 @@
 use core::ffi::c_void;
 use roc_env::arg::ArgToAndFromHost;
 use roc_std::{RocList, RocResult, RocStr};
+use std::io::Write;
 use tokio::runtime::Runtime;
 thread_local! {
    static TOKIO_RUNTIME: Runtime = tokio::runtime::Builder::new_current_thread()
@@ -194,6 +195,7 @@ pub fn init() {
         roc_panic as _,
         roc_dbg as _,
         roc_memset as _,
+        roc_fx_log as _,
         roc_fx_stdout_line as _,
         roc_fx_hello as _,
     ];
@@ -228,6 +230,19 @@ pub extern "C" fn rust_main(args: RocList<ArgToAndFromHost>) -> i32 {
     };
     exit_code
 }
+#[no_mangle]
+pub extern "C" fn roc_fx_log(line: &RocStr) {
+    let stdout = std::io::stdout();
+
+    let mut handle = stdout.lock();
+
+    handle
+        .write_all(line.as_bytes())
+        .and_then(|()| handle.write_all("\n".as_bytes()))
+        .and_then(|()| handle.flush())
+        .unwrap();
+}
+
 #[no_mangle]
 pub extern "C" fn roc_fx_stdout_line(line: &RocStr) -> RocResult<(), roc_io_error::IOErr> {
     roc_stdio::stdout_line(line)
diff --git a/pkgs/roc/platforms/rust-minimal-cli/platform/Effect.roc b/pkgs/roc/platforms/rust-minimal-cli/platform/Effect.roc
@@ -0,0 +1,4 @@
+hosted [
+    log!,
+]
+log! : Str => {}
diff --git a/pkgs/roc/platforms/rust-minimal-cli/platform/main.roc b/pkgs/roc/platforms/rust-minimal-cli/platform/main.roc
@@ -6,9 +6,23 @@ platform "rust-minimal-cli"
     provides [main_for_host!]
 import Arg
 import InternalArg
+import Effect
 main_for_host! = |raw_args|
-    main!(
-        raw_args
-        |> List.map(InternalArg.to_os_raw)
-        |> List.map(Arg.from_os_raw),
-    )
+    when
+        main!(
+            raw_args
+            |> List.map(InternalArg.to_os_raw)
+            |> List.map(Arg.from_os_raw),
+        )
+    is
+        Ok({}) -> 0
+        Err(Exit(code, str)) ->
+            if Str.is_empty(str) then
+                code
+            else
+                Effect.log!(str)
+                code
+
+        Err(other) ->
+            Effect.log!("Program exited early with error: ${Inspect.to_str(other)}")
+            1
diff --git a/pkgs/roc/platforms/rust-minimal-cli/platform/metadata_linux-x64.rm b/pkgs/roc/platforms/rust-minimal-cli/platform/metadata_linux-x64.rm

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@ app [main] {`
`2`	`2`	`pf: platform "./Platform/main.roc",`
`3`	`3`	`lib: "./Lib/main.roc",`
`4`	`4`	`}`
`5`		`-import lib.Display exposing [str, matrix]`
`6`		`-main : Str`
`7`		`-main = str(matrix [261, 23])`
	`5`	`+import lib.Display exposing [to_str, matrix]`
	`6`	`+main = to_str(matrix [261, 23])`