Merge pull request #149 from roc-lang/fix_issue_146

Fix issue 146

ci/expect_scripts/http-get.exp

@@ -9,10 +9,6 @@ source ./ci/expect_scripts/shared-code.exp
 
 spawn $env(EXAMPLES_DIR)http-get
 
-expect -exact "Enter a URL to fetch. It must contain a scheme like \"http://\" or \"https://\".\r\n"
-
-send -- "http://www.example.com\r"
-
 expect "</html>\r\n" {
     expect eof {
         check_exit_and_segfault

examples/http-get.roc

@@ -1,31 +1,22 @@
 app "http-get"
     packages { pf: "../platform/main.roc" }
-    imports [pf.Http, pf.Task.{ Task }, pf.Stdin, pf.Stdout]
+    imports [pf.Http, pf.Task.{ Task }, pf.Stdout]
     provides [main] to pf
 
 main : Task {} I32
 main =
-    _ <- Task.await (Stdout.line "Enter a URL to fetch. It must contain a scheme like \"http://\" or \"https://\".")
+    request = {
+        method: Get,
+        headers: [],
+        url: "http://www.example.com",
+        body: Http.emptyBody,
+        timeout: TimeoutMilliseconds 5000,
+    }
 
-    input <- Task.await Stdin.line
+    output <- Http.send request
+        |> Task.onErr \err -> err 
+            |> Http.errorToString 
+            |> Task.ok
+        |> Task.await
 
-    when input is
-        End ->
-            Stdout.line "I received end-of-input (EOF) instead of a URL."
-
-        Input url -> 
-            request = {
-                method: Get,
-                headers: [],
-                url,
-                body: Http.emptyBody,
-                timeout: NoTimeout,
-            }
-
-            output <- Http.send request
-                |> Task.onErr \err -> err 
-                    |> Http.errorToString 
-                    |> Task.ok
-                |> Task.await
-
-            Stdout.line output
+    Stdout.line output

platform/src/lib.rs

@@ -694,7 +694,7 @@ pub extern "C" fn roc_fx_sendRequest(roc_request: &glue::Request) -> glue::Respo
         }
     };
     match time_limit {
-        Some(limit) => match rt.block_on(tokio::time::timeout(limit, http_fn)) {
+        Some(limit) => match rt.block_on(async { tokio::time::timeout(limit, http_fn).await}) {
             Ok(res) => res,
             Err(_) => glue::Response::Timeout,
         },