Merge branch 'main' into basic-cli-0-12-0

roc-lang · Jul 17, 2024 · cd08fdd · cd08fdd
2 parents c1e80bb + 5b87d82
commit cd08fdd
Show file tree

Hide file tree

Showing 175 changed files with 8,350 additions and 4,808 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 target
 generated-docs
 zig-cache
+.zig-cache
 .direnv
 .envrc
 *.rs.bk

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/src/format.rs b/crates/cli/src/format.rs
@@ -256,15 +256,15 @@ mod tests {
     use std::io::Write;
     use tempfile::{tempdir, TempDir};
 
-    const FORMATTED_ROC: &str = r#"app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+    const FORMATTED_ROC: &str = r#"app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
 import pf.Task
 
 main =
     Stdout.line! "I'm a Roc application!""#;
 
-    const UNFORMATTED_ROC: &str = r#"app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+    const UNFORMATTED_ROC: &str = r#"app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 
 import pf.Stdout

diff --git a/crates/cli/tests/cli/argsBROKEN.roc b/crates/cli/tests/cli/argsBROKEN.roc
diff --git a/crates/cli/tests/cli/combine-tasks.roc b/crates/cli/tests/cli/combine-tasks.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
 import pf.Task exposing [Task]

diff --git a/crates/cli/tests/cli/countdown.roc b/crates/cli/tests/cli/countdown.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdin
 import pf.Stdout

diff --git a/crates/cli/tests/cli/echo.roc b/crates/cli/tests/cli/echo.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdin
 import pf.Stdout

diff --git a/crates/cli/tests/cli/env.roc b/crates/cli/tests/cli/env.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
 import pf.Stderr

diff --git a/crates/cli/tests/cli/fileBROKEN.roc b/crates/cli/tests/cli/fileBROKEN.roc
@@ -1,25 +1,26 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
 import pf.Task exposing [Task]
 import pf.File
 import pf.Path
 import pf.Env
-import pf.Dir
 
 main : Task {} [Exit I32 Str]_
 main =
-    path = Path.fromStr "out.txt"
+    pathStr = "out.txt"
 
     task =
-        cwd = Env.cwd!
-        Stdout.line! "cwd: $(Path.display cwd)"
-        dirEntries = Dir.list! cwd
+        cwdPath = Env.cwd!
+        cwdStr = Path.display cwdPath
+        Stdout.line! "Current working directory: $(cwdStr)"
+
+        dirEntries = Path.listDir! cwdPath
         contentsStr = Str.joinWith (List.map dirEntries Path.display) "\n    "
         Stdout.line! "Directory contents:\n    $(contentsStr)\n"
         Stdout.line! "Writing a string to out.txt"
-        File.writeUtf8! path "a string!"
-        contents = File.readUtf8! path
+        File.writeUtf8! pathStr "a string!"
+        contents = File.readUtf8! pathStr
         Stdout.line! "I read the file back. Its contents: \"$(contents)\""
 
     when Task.result! task is

diff --git a/crates/cli/tests/cli/form.roc b/crates/cli/tests/cli/form.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdin
 import pf.Stdout

diff --git a/crates/cli/tests/cli/http-get.roc b/crates/cli/tests/cli/http-get.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Http
 import pf.Task exposing [Task]

diff --git a/crates/cli/tests/cli/ingested-file-bytes-no-ann.roc b/crates/cli/tests/cli/ingested-file-bytes-no-ann.roc
@@ -1,10 +1,11 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
-import "ingested-file.roc" as license
+import "test-file.txt" as testFile
 
 main =
-    license
+    # Due to the functions we apply on testFile, it will be inferred as a List U8.
+    testFile
         |> List.map Num.toU64
         |> List.sum
         |> Num.toStr

diff --git a/crates/cli/tests/cli/ingested-file-bytes.roc b/crates/cli/tests/cli/ingested-file-bytes.roc
@@ -1,11 +1,11 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
-import "ingested-file.roc" as license : _ # A type hole can also be used here.
+import "test-file.txt" as testFile : _ # the _ is optional
 
 main =
-    # Due to how license is used, it will be a List U8.
-    license
+    # Due to the functions we apply on testFile, it will be inferred as a List U8.
+    testFile
         |> List.map Num.toU64
         |> List.sum
         |> Num.toStr

diff --git a/crates/cli/tests/cli/ingested-file.roc b/crates/cli/tests/cli/ingested-file.roc
@@ -1,4 +1,4 @@
-app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br" }
+app [main] { pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br" }
 
 import pf.Stdout
 import "ingested-file.roc" as ownCode : Str

diff --git a/crates/cli/tests/cli/parse-args.roc b/crates/cli/tests/cli/parse-args.roc
@@ -1,8 +1,7 @@
 app [main] {
-    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br",
 }
 
-import pf.Arg
 import pf.Stdout
 import pf.Task exposing [Task]
 

diff --git a/crates/cli/tests/cli/parser-letter-counts.roc b/crates/cli/tests/cli/parser-letter-counts.roc
@@ -1,5 +1,5 @@
 app [main] {
-    cli: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    cli: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br",
     parser: "https://github.com/lukewilliamboswell/roc-parser/releases/download/0.5.2/9VrPjwfQQ1QeSL3CfmWr2Pr9DESdDIXy97pwpuq84Ck.tar.br",
 }
 

diff --git a/crates/cli/tests/cli/parser-movies-csv.roc b/crates/cli/tests/cli/parser-movies-csv.roc
@@ -1,14 +1,14 @@
 app [main] {
-    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.10.0/vNe6s9hWzoTZtFmNkvEICPErI9ptji_ySjicO6CkucY.tar.br",
+    pf: platform "https://github.com/roc-lang/basic-cli/releases/download/0.12.0/Lb8EgiejTUzbggO2HVVuPJFkwvvsfW6LojkLR20kTVE.tar.br",
     parser: "https://github.com/lukewilliamboswell/roc-parser/releases/download/0.5.2/9VrPjwfQQ1QeSL3CfmWr2Pr9DESdDIXy97pwpuq84Ck.tar.br",
 }
 
 import pf.Stdout
 import pf.Stderr
 import pf.Task exposing [Task]
-import parser.Core exposing [Parser, map, keep]
+import parser.Core exposing [map, keep]
 import parser.String exposing [strFromUtf8]
-import parser.CSV exposing [CSV]
+import parser.CSV
 
 input : Str
 input = "Airplane!,1980,\"Robert Hays,Julie Hagerty\"\r\nCaddyshack,1980,\"Chevy Chase,Rodney Dangerfield,Ted Knight,Michael O'Keefe,Bill Murray\""

diff --git a/crates/cli/tests/cli/test-file.txt b/crates/cli/tests/cli/test-file.txt
@@ -0,0 +1 @@
+Used by ingested-file-bytes.roc and ingested-file-bytes-no-ann.roc
diff --git a/crates/cli/tests/cli_run.rs b/crates/cli/tests/cli_run.rs
@@ -79,6 +79,8 @@ mod cli_run {
     #[derive(Debug, PartialEq, Eq)]
     enum Arg<'a> {
         ExamplePath(&'a str),
+        // allow because we may need PlainText in the future
+        #[allow(dead_code)]
         PlainText(&'a str),
     }
 
@@ -799,39 +801,6 @@ mod cli_run {
         )
     }
 
-    #[test]
-    #[ignore = "currently broken in basic-cli platform"]
-    #[cfg_attr(windows, ignore = "missing __udivdi3 and some other symbols")]
-    #[serial(cli_platform)]
-    fn cli_args() {
-        test_roc_app(
-            "examples/cli",
-            "argsBROKEN.roc",
-            &[],
-            &[
-                Arg::PlainText("log"),
-                Arg::PlainText("-b"),
-                Arg::PlainText("3"),
-                Arg::PlainText("--num"),
-                Arg::PlainText("81"),
-            ],
-            &[],
-            "4\n",
-            UseValgrind::No,
-            TestCliCommands::Run,
-        )
-    }
-
-    // TODO: remove in favor of cli_args once mono bugs are resolved in investigation
-    #[test]
-    #[cfg_attr(windows, ignore = "missing __udivdi3 and some other symbols")]
-    #[serial(cli_platform)]
-    fn cli_args_check() {
-        let path = file_path_from_root("crates/cli/tests/cli", "argsBROKEN.roc");
-        let out = run_roc([CMD_CHECK, path.to_str().unwrap()], &[], &[]);
-        assert!(out.status.success());
-    }
-
     // TODO: write a new test once mono bugs are resolved in investigation
     #[test]
     #[cfg(not(debug_assertions))] // https://github.com/roc-lang/roc/issues/4806
@@ -1030,7 +999,7 @@ mod cli_run {
             &[],
             &[],
             &[],
-            "27101\n",
+            "6239\n",
             UseValgrind::No,
             TestCliCommands::Run,
         )
@@ -1045,7 +1014,7 @@ mod cli_run {
             &[],
             &[],
             &[],
-            "27101\n",
+            "6239\n",
             UseValgrind::No,
             TestCliCommands::Run,
         )