Skip to content

Commit 8b2a4cc

Browse files
Anton-4Anton-4
authored
Merge pull request #52 from roc-lang/upgrade-syntax
Upgrade module syntax and fix import warnings
2 parents 926872c + fb0bd15 commit 8b2a4cc

40 files changed

Lines changed: 332 additions & 359 deletions

‎ci/expect_scripts/file.exp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spawn $env(EXAMPLES_DIR)file
1010
expect "Listening on <http://localhost:8000>\r\n" {
1111
set curlOutput [exec curl -sS localhost:8000]
1212

13-
if { [string match "Source code of current program:\n\napp \"file\"*" $curlOutput] } {
13+
if { [string match "Source code of current program:\n\napp *" $curlOutput] } {
1414
exit 0
1515
} else {
1616
puts "Error: curl output was different than expected: $curlOutput"

‎examples/command.roc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
app "command"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Task.{ Task },
5-
pf.Http.{ Request, Response },
6-
pf.Command,
7-
pf.Utc,
8-
]
9-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Task exposing [Task]
4+
import pf.Http exposing [Request, Response]
5+
import pf.Command
6+
import pf.Utc
107

118
main : Request -> Task Response []
129
main = \req ->
@@ -22,7 +19,7 @@ main = \req ->
2219
when result is
2320
Ok {} -> respond "Command succeeded\n"
2421
Err (ExitCode code) -> respond "Command exited with code $(Num.toStr code)\n"
25-
Err (KilledBySignal) -> respond "Command was killed by signal\n"
22+
Err KilledBySignal -> respond "Command was killed by signal\n"
2623
Err (IOError str) -> respond "IO Error: $(str)\n"
2724

2825
respond = \str -> Task.ok { status: 200, headers: [], body: Str.toUtf8 str }

‎examples/dir.roc‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
app "dir"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Stdout,
5-
pf.Stderr,
6-
pf.Dir,
7-
pf.Env,
8-
pf.Path,
9-
pf.Task.{ Task },
10-
pf.Http.{ Request, Response },
11-
]
12-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Stdout
4+
import pf.Stderr
5+
import pf.Dir
6+
import pf.Env
7+
import pf.Path
8+
import pf.Task exposing [Task]
9+
import pf.Http exposing [Request, Response]
1310

1411
main : Request -> Task Response []
1512
main = \_ ->

‎examples/echo.roc‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
app "echo"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Stdout,
5-
pf.Task.{ Task },
6-
pf.Http.{ Request, Response },
7-
pf.Utc,
8-
]
9-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Stdout
4+
import pf.Task exposing [Task]
5+
import pf.Http exposing [Request, Response]
6+
import pf.Utc
107

118
main : Request -> Task Response []
129
main = \req ->

‎examples/env.roc‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
app "env"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Task.{ Task },
5-
pf.Http.{ Request, Response },
6-
pf.Env,
7-
]
8-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Task exposing [Task]
4+
import pf.Http exposing [Request, Response]
5+
import pf.Env
96

107
main : Request -> Task Response []
118
main = \_ ->

‎examples/error-handling.roc‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
# This example demonstrates error handling and fetching content from another website.
2-
app "error-handling"
3-
packages { pf: "../platform/main.roc" }
4-
imports [
5-
pf.Stdout,
6-
pf.Stderr,
7-
pf.Task.{ Task },
8-
pf.Http.{ Request, Response },
9-
pf.Utc,
10-
pf.Env,
11-
]
12-
provides [main] to pf
2+
app [main] { pf: platform "../platform/main.roc" }
3+
4+
import pf.Stdout
5+
import pf.Stderr
6+
import pf.Task exposing [Task]
7+
import pf.Http exposing [Request, Response]
8+
import pf.Utc
9+
import pf.Env
1310

1411
main : Request -> Task Response []
1512
main = \req ->
@@ -43,7 +40,7 @@ logRequest = \req ->
4340

4441
readEnvVar : Str -> Task Str [EnvVarNotSet Str]
4542
readEnvVar = \envVarName ->
46-
Env.var envVarName
43+
Env.var envVarName
4744
|> Task.mapErr \_ -> EnvVarNotSet envVarName
4845

4946
fetchContent : Str -> Task Str [HttpError Http.Error]

‎examples/file.roc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
app "file"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.File,
5-
pf.Path,
6-
pf.Task.{ Task },
7-
pf.Http.{ Request, Response },
8-
]
9-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.File
4+
import pf.Path
5+
import pf.Task exposing [Task]
6+
import pf.Http exposing [Request, Response]
107

118
main : Request -> Task Response []
129
main = \_ ->
@@ -30,4 +27,4 @@ okHttp = \bodyStr ->
3027

3128
internalErrHttp : Str -> Task Response []
3229
internalErrHttp = \bodyStr ->
33-
Task.ok { status: 500, headers: [], body: Str.toUtf8 bodyStr }
30+
Task.ok { status: 500, headers: [], body: Str.toUtf8 bodyStr }

‎examples/hello-web.roc‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
app "hello-web"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Stdout,
5-
pf.Task.{ Task },
6-
pf.Http.{ Request, Response },
7-
pf.Utc,
8-
]
9-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Stdout
4+
import pf.Task exposing [Task]
5+
import pf.Http exposing [Request, Response]
6+
import pf.Utc
107

118
main : Request -> Task Response []
129
main = \req ->

‎examples/result.roc‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
app "result"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Task.{ Task },
5-
pf.Http.{ Request, Response },
6-
]
7-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Task exposing [Task]
4+
import pf.Http exposing [Request, Response]
85

96
# This example demonstrates the use of `Task.result`.
107
# It transforms a task that can either succeed with `ok`, or fail with `err`, into
@@ -15,13 +12,13 @@ main = \_ ->
1512
when checkFile "good" |> Task.result! is
1613
Ok Good -> Task.ok { status: 200, headers: [], body: Str.toUtf8 "GOOD" }
1714
Ok Bad -> Task.ok { status: 200, headers: [], body: Str.toUtf8 "BAD" }
18-
Err IOError -> Task.ok { status: 500, headers: [], body: Str.toUtf8 "ERROR: IoError when executing checkFile." }
15+
Err IOError -> Task.ok { status: 500, headers: [], body: Str.toUtf8 "ERROR: IoError when executing checkFile." }
1916

2017
checkFile : Str -> Task [Good, Bad] [IOError]
2118
checkFile = \str ->
22-
if str == "good" then
23-
Task.ok Good
24-
else if str == "bad" then
25-
Task.ok Bad
26-
else
19+
if str == "good" then
20+
Task.ok Good
21+
else if str == "bad" then
22+
Task.ok Bad
23+
else
2724
Task.err IOError

‎examples/sleep.roc‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
app "echo"
2-
packages { pf: "../platform/main.roc" }
3-
imports [
4-
pf.Stdout,
5-
pf.Task.{ Task },
6-
pf.Http.{ Request, Response },
7-
pf.Sleep,
8-
]
9-
provides [main] to pf
1+
app [main] { pf: platform "../platform/main.roc" }
2+
3+
import pf.Stdout
4+
import pf.Task exposing [Task]
5+
import pf.Http exposing [Request, Response]
6+
import pf.Sleep
107

118
main : Request -> Task Response []
129
main = \_ ->

0 commit comments

Comments
 (0)