diff --git a/compiler/fmt/src/def.rs b/compiler/fmt/src/def.rs index 79790271f4..224e16090f 100644 --- a/compiler/fmt/src/def.rs +++ b/compiler/fmt/src/def.rs @@ -59,13 +59,9 @@ impl<'a> Formattable for Def<'a> { buf.indent(indent); buf.push_str(name.value); - if vars.is_empty() { + for var in *vars { buf.spaces(1); - } else { - for var in *vars { - buf.spaces(1); - fmt_pattern(buf, &var.value, indent, Parens::NotNeeded); - } + fmt_pattern(buf, &var.value, indent, Parens::NotNeeded); } buf.push_str(" :"); diff --git a/compiler/fmt/tests/test_fmt.rs b/compiler/fmt/tests/test_fmt.rs index 6b1ebd5086..b834f7f1e0 100644 --- a/compiler/fmt/tests/test_fmt.rs +++ b/compiler/fmt/tests/test_fmt.rs @@ -2725,7 +2725,7 @@ mod test_fmt { fn multiline_tag_union_annotation_beginning_on_same_line() { expr_formats_same(indoc!( r#" - Expr : [ + Expr : [ Add Expr Expr, Mul Expr Expr, Val I64, diff --git a/examples/benchmarks/Base64/Encode.roc b/examples/benchmarks/Base64/Encode.roc index 2753c18980..2806ddf4b5 100644 --- a/examples/benchmarks/Base64/Encode.roc +++ b/examples/benchmarks/Base64/Encode.roc @@ -2,7 +2,7 @@ interface Base64.Encode exposes [ toBytes ] imports [ Bytes.Encode.{ Encoder } ] -InvalidChar : U8 +InvalidChar : U8 # State : [ None, One U8, Two U8, Three U8 ] toBytes : Str -> List U8 diff --git a/examples/benchmarks/Bytes/Decode.roc b/examples/benchmarks/Bytes/Decode.roc index ede0ecc6b3..d5e22e8f78 100644 --- a/examples/benchmarks/Bytes/Decode.roc +++ b/examples/benchmarks/Bytes/Decode.roc @@ -1,8 +1,8 @@ interface Bytes.Decode exposes [ Decoder, decode, map, map2, u8, loop, Step, succeed, DecodeProblem, after, map3 ] imports [] -State : { bytes : List U8, cursor : Nat } +State : { bytes : List U8, cursor : Nat } -DecodeProblem : [ OutOfBytes ] +DecodeProblem : [ OutOfBytes ] Decoder a : [ @Decoder (State -> [ Good State a, Bad DecodeProblem ]) ] diff --git a/examples/benchmarks/Bytes/Encode.roc b/examples/benchmarks/Bytes/Encode.roc index 855d62a9a1..a541f4806b 100644 --- a/examples/benchmarks/Bytes/Encode.roc +++ b/examples/benchmarks/Bytes/Encode.roc @@ -1,8 +1,8 @@ interface Bytes.Encode exposes [ Encoder, sequence, u8, u16, bytes, empty, encode ] imports [] -Endianness : [ BE, LE ] +Endianness : [ BE, LE ] -Encoder : [ Signed8 I8, Unsigned8 U8, Signed16 Endianness I16, Unsigned16 Endianness U16, Sequence Nat (List Encoder), Bytes (List U8) ] +Encoder : [ Signed8 I8, Unsigned8 U8, Signed16 Endianness I16, Unsigned16 Endianness U16, Sequence Nat (List Encoder), Bytes (List U8) ] u8 : U8 -> Encoder u8 = \value -> Unsigned8 value diff --git a/examples/benchmarks/CFold.roc b/examples/benchmarks/CFold.roc index 76eab00b7f..96dd438a04 100644 --- a/examples/benchmarks/CFold.roc +++ b/examples/benchmarks/CFold.roc @@ -19,7 +19,7 @@ main = |> Str.concat (Num.toStr optimized) |> Task.putLine -Expr : [ +Expr : [ Add Expr Expr, Mul Expr Expr, Val I64, diff --git a/examples/benchmarks/Deriv.roc b/examples/benchmarks/Deriv.roc index c601ea3f43..5e5a81f8b2 100644 --- a/examples/benchmarks/Deriv.roc +++ b/examples/benchmarks/Deriv.roc @@ -21,7 +21,7 @@ main = |> Task.map (\_ -> {}) -Expr : [ Val I64, Var Str, Add Expr Expr, Mul Expr Expr, Pow Expr Expr, Ln Expr ] +Expr : [ Val I64, Var Str, Add Expr Expr, Mul Expr Expr, Pow Expr Expr, Ln Expr ] divmod : I64, I64 -> Result { div : I64, mod : I64 } [ DivByZero ]* divmod = \l, r -> diff --git a/examples/benchmarks/RBTreeCk.roc b/examples/benchmarks/RBTreeCk.roc index c6a89c46ca..225df33161 100644 --- a/examples/benchmarks/RBTreeCk.roc +++ b/examples/benchmarks/RBTreeCk.roc @@ -3,11 +3,11 @@ app "rbtree-ck" imports [ pf.Task ] provides [ main ] to pf -Color : [ Red, Black ] +Color : [ Red, Black ] Tree a b : [ Leaf, Node Color (Tree a b) a b (Tree a b) ] -Map : Tree I64 Bool +Map : Tree I64 Bool ConsList a : [ Nil, Cons a (ConsList a) ] diff --git a/examples/benchmarks/RBTreeDel.roc b/examples/benchmarks/RBTreeDel.roc index c7523a5661..24419ef84a 100644 --- a/examples/benchmarks/RBTreeDel.roc +++ b/examples/benchmarks/RBTreeDel.roc @@ -3,11 +3,11 @@ app "rbtree-del" imports [ pf.Task ] provides [ main ] to pf -Color : [ Red, Black ] +Color : [ Red, Black ] Tree a b : [ Leaf, Node Color (Tree a b) a b (Tree a b) ] -Map : Tree I64 Bool +Map : Tree I64 Bool ConsList a : [ Nil, Cons a (ConsList a) ] diff --git a/examples/benchmarks/RBTreeInsert.roc b/examples/benchmarks/RBTreeInsert.roc index 54095168f2..cbe0a83ffa 100644 --- a/examples/benchmarks/RBTreeInsert.roc +++ b/examples/benchmarks/RBTreeInsert.roc @@ -50,7 +50,7 @@ showColor = \color -> Black -> "Black" -NodeColor : [ Red, Black ] +NodeColor : [ Red, Black ] RedBlackTree k v : [ Node NodeColor k v (RedBlackTree k v) (RedBlackTree k v), Empty ] diff --git a/examples/effect/RBTree.roc b/examples/effect/RBTree.roc index fa1e96aab3..b6dea736cf 100644 --- a/examples/effect/RBTree.roc +++ b/examples/effect/RBTree.roc @@ -1,7 +1,7 @@ interface RBTree exposes [ Dict, empty, size, singleton, isEmpty, insert, remove, update, fromList, toList, balance ] imports [] # The color of a node. Leaves are considered Black. -NodeColor : [ Red, Black ] +NodeColor : [ Red, Black ] Dict k v : [ Node NodeColor k v (Dict k v) (Dict k v), Empty ] diff --git a/examples/false-interpreter/Context.roc b/examples/false-interpreter/Context.roc index 9ad06bd7f7..11fea10961 100644 --- a/examples/false-interpreter/Context.roc +++ b/examples/false-interpreter/Context.roc @@ -5,12 +5,12 @@ interface Context Option a : [ Some a, None ] # The underlying context of the current location within the file -Data : [ Lambda (List U8), Number I32, Var Variable ] +Data : [ Lambda (List U8), Number I32, Var Variable ] # While loops are special and have their own Scope specific state. -WhileState : { cond : List U8, body : List U8, state : [ InCond, InBody ] } -Scope : { data : Option File.Handle, index : Nat, buf : List U8, whileInfo : Option WhileState } -State : [ Executing, InComment, InLambda Nat (List U8), InString (List U8), InNumber I32, InSpecialChar, LoadChar ] -Context : { scopes : List Scope, stack : List Data, vars : List Data, state : State } +WhileState : { cond : List U8, body : List U8, state : [ InCond, InBody ] } +Scope : { data : Option File.Handle, index : Nat, buf : List U8, whileInfo : Option WhileState } +State : [ Executing, InComment, InLambda Nat (List U8), InString (List U8), InNumber I32, InSpecialChar, LoadChar ] +Context : { scopes : List Scope, stack : List Data, vars : List Data, state : State } pushStack : Context, Data -> Context pushStack = \ctx, data -> diff --git a/examples/false-interpreter/False.roc b/examples/false-interpreter/False.roc index 7c7f6a3bc8..57fc3c14a9 100644 --- a/examples/false-interpreter/False.roc +++ b/examples/false-interpreter/False.roc @@ -16,7 +16,7 @@ app "false" # In an imperative language, a few of these pieces would be in while loops and it would basically never overflow. # This implementation is easy to overflow, either make the input long enough or make a false while loop run long enough. # I assume all of the Task.awaits are the cause of this, but I am not 100% sure. -InterpreterErrors : [ BadUtf8, DivByZero, EmptyStack, InvalidBooleanValue, InvalidChar Str, MaxInputNumber, NoLambdaOnStack, NoNumberOnStack, NoVariableOnStack, NoScope, OutOfBounds, UnexpectedEndOfData ] +InterpreterErrors : [ BadUtf8, DivByZero, EmptyStack, InvalidBooleanValue, InvalidChar Str, MaxInputNumber, NoLambdaOnStack, NoNumberOnStack, NoVariableOnStack, NoScope, OutOfBounds, UnexpectedEndOfData ] main : Str -> Task {} [] main = \filename -> diff --git a/examples/false-interpreter/Variable.roc b/examples/false-interpreter/Variable.roc index 5a04da8d66..c4675c06c9 100644 --- a/examples/false-interpreter/Variable.roc +++ b/examples/false-interpreter/Variable.roc @@ -4,7 +4,7 @@ interface Variable # Variables in False can only be single letters. Thus, the valid variables are "a" to "z". # This opaque type deals with ensure we always have valid variables. -Variable : [ @Variable U8 ] +Variable : [ @Variable U8 ] totalCount : Nat totalCount = diff --git a/examples/false-interpreter/platform/File.roc b/examples/false-interpreter/platform/File.roc index 6c41062eaf..36d8887640 100644 --- a/examples/false-interpreter/platform/File.roc +++ b/examples/false-interpreter/platform/File.roc @@ -2,7 +2,7 @@ interface File exposes [ line, Handle, withOpen, chunk ] imports [ fx.Effect, Task.{ Task } ] -Handle : [ @Handle U64 ] +Handle : [ @Handle U64 ] line : Handle -> Task.Task Str * line = \@Handle handle -> Effect.after (Effect.getFileLine handle) Task.succeed