language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 23:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Resolve conflicts with remote

Browse source
This commit is contained in:
Chad Stearns 2020-07-26 21:41:38 -04:00
commit 59b30ad20f
14 changed files with 346 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/module/src/symbol.rs
View file

@ -648,7 +648,7 @@ define_builtins! {
2 LIST_IS_EMPTY: "isEmpty"
3 LIST_GET: "get"
4 LIST_SET: "set"
5 LIST_PUSH: "push"
5 LIST_APPEND: "append"
6 LIST_MAP: "map"
7 LIST_LEN: "len"
8 LIST_FOLDL: "foldl"
@ -658,8 +658,7 @@ define_builtins! {
12 LIST_SINGLE: "single"
13 LIST_REPEAT: "repeat"
14 LIST_REVERSE: "reverse"
15 LIST_APPEND: "append"
16 LIST_PREPEND: "prepend"
15 LIST_PREPEND: "prepend"
}
5 RESULT: "Result" => {
0 RESULT_RESULT: "Result" imported // the Result.Result type alias