From 518b21c3f849183b682c6c51110955bc84c5baee Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Sun, 17 Jul 2022 15:03:18 -0400 Subject: [PATCH] Rename Json.format to Json.toUtf8 --- crates/compiler/builtins/roc/Json.roc | 4 +-- crates/compiler/solve/tests/solve_expr.rs | 4 +-- crates/compiler/test_gen/src/gen_abilities.rs | 28 +++++++++---------- crates/compiler/test_mono/src/tests.rs | 16 +++++------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/crates/compiler/builtins/roc/Json.roc b/crates/compiler/builtins/roc/Json.roc index 91fab6bf7d..132d2a0dbf 100644 --- a/crates/compiler/builtins/roc/Json.roc +++ b/crates/compiler/builtins/roc/Json.roc @@ -1,7 +1,7 @@ interface Json exposes [ Json, - format, + toUtf8, ] imports [ List, @@ -33,7 +33,7 @@ interface Json Json := {} -format = @Json {} +toUtf8 = @Json {} numToBytes = \n -> n |> Num.toStr |> Str.toUtf8 diff --git a/crates/compiler/solve/tests/solve_expr.rs b/crates/compiler/solve/tests/solve_expr.rs index e30a1431bd..ddfb7cb863 100644 --- a/crates/compiler/solve/tests/solve_expr.rs +++ b/crates/compiler/solve/tests/solve_expr.rs @@ -6475,7 +6475,7 @@ mod solve_expr { |> Encode.appendWith (Encode.string "Hello, World!\n") fmt main = - when Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.format) is + when Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.toUtf8) is Ok s -> s _ -> "" "# @@ -7157,7 +7157,7 @@ mod solve_expr { main = foo = 1 - @Go it = (f (@Fo {})) {} + @Go it = (f (@Fo {})) {} # ^ # ^^^^^^^^^^ diff --git a/crates/compiler/test_gen/src/gen_abilities.rs b/crates/compiler/test_gen/src/gen_abilities.rs index 30b2b5486e..7317678815 100644 --- a/crates/compiler/test_gen/src/gen_abilities.rs +++ b/crates/compiler/test_gen/src/gen_abilities.rs @@ -340,7 +340,7 @@ fn encode_use_stdlib() { |> Encode.appendWith (Encode.string "Hello, World!\n") fmt main = - result = Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.format) + result = Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.toUtf8) when result is Ok s -> s _ -> "" @@ -365,7 +365,7 @@ fn encode_use_stdlib_without_wrapping_custom() { toEncoder = \@HelloWorld {} -> Encode.string "Hello, World!\n" main = - result = Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.format) + result = Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.toUtf8) when result is Ok s -> s _ -> "" @@ -393,7 +393,7 @@ fn to_encoder_encode_custom_has_capture() { |> Encode.appendWith (Encode.string s1) fmt main = - result = Str.fromUtf8 (Encode.toBytes (@HelloWorld "Hello, World!\n") Json.format) + result = Str.fromUtf8 (Encode.toBytes (@HelloWorld "Hello, World!\n") Json.toUtf8) when result is Ok s -> s _ -> "" @@ -423,7 +423,7 @@ mod encode_immediate { app "test" imports [Encode.{ toEncoder }, Json] provides [main] to "./platform" main = - when Str.fromUtf8 (Encode.toBytes "foo" Json.format) is + when Str.fromUtf8 (Encode.toBytes "foo" Json.toUtf8) is Ok s -> s _ -> "" "# @@ -444,7 +444,7 @@ mod encode_immediate { app "test" imports [Encode.{{ toEncoder }}, Json] provides [main] to "./platform" main = - when Str.fromUtf8 (Encode.toBytes {}{} Json.format) is + when Str.fromUtf8 (Encode.toBytes {}{} Json.toUtf8) is Ok s -> s _ -> "" "# @@ -484,7 +484,7 @@ fn encode_derived_record_one_field_string() { provides [main] to "./platform" main = - result = Str.fromUtf8 (Encode.toBytes {a: "foo"} Json.format) + result = Str.fromUtf8 (Encode.toBytes {a: "foo"} Json.toUtf8) when result is Ok s -> s _ -> "" @@ -507,7 +507,7 @@ fn encode_derived_record_two_fields_strings() { main = rcd = {a: "foo", b: "bar"} - result = Str.fromUtf8 (Encode.toBytes rcd Json.format) + result = Str.fromUtf8 (Encode.toBytes rcd Json.toUtf8) when result is Ok s -> s _ -> "" @@ -530,7 +530,7 @@ fn encode_derived_nested_record_string() { main = rcd = {a: {b: "bar"}} - encoded = Encode.toBytes rcd Json.format + encoded = Encode.toBytes rcd Json.toUtf8 result = Str.fromUtf8 encoded when result is Ok s -> s @@ -555,7 +555,7 @@ fn encode_derived_tag_one_payload_string() { main = x : [A Str] x = A "foo" - result = Str.fromUtf8 (Encode.toBytes x Json.format) + result = Str.fromUtf8 (Encode.toBytes x Json.toUtf8) when result is Ok s -> s _ -> "" @@ -579,7 +579,7 @@ fn encode_derived_tag_two_payloads_string() { main = x : [A Str Str] x = A "foo" "bar" - result = Str.fromUtf8 (Encode.toBytes x Json.format) + result = Str.fromUtf8 (Encode.toBytes x Json.toUtf8) when result is Ok s -> s _ -> "" @@ -603,7 +603,7 @@ fn encode_derived_nested_tag_string() { main = x : [A [B Str Str]] x = A (B "foo" "bar") - encoded = Encode.toBytes x Json.format + encoded = Encode.toBytes x Json.toUtf8 result = Str.fromUtf8 encoded when result is Ok s -> s @@ -628,7 +628,7 @@ fn encode_derived_nested_record_tag_record() { main = x : {a: [B {c: Str}]} x = {a: (B ({c: "foo"}))} - encoded = Encode.toBytes x Json.format + encoded = Encode.toBytes x Json.toUtf8 result = Str.fromUtf8 encoded when result is Ok s -> s @@ -652,7 +652,7 @@ fn encode_derived_list_string() { main = lst = ["foo", "bar", "baz"] - encoded = Encode.toBytes lst Json.format + encoded = Encode.toBytes lst Json.toUtf8 result = Str.fromUtf8 encoded when result is Ok s -> s @@ -676,7 +676,7 @@ fn encode_derived_list_of_records() { main = lst = [{a: "foo"}, {a: "bar"}, {a: "baz"}] - encoded = Encode.toBytes lst Json.format + encoded = Encode.toBytes lst Json.toUtf8 result = Str.fromUtf8 encoded when result is Ok s -> s diff --git a/crates/compiler/test_mono/src/tests.rs b/crates/compiler/test_mono/src/tests.rs index 179325d87d..a7151a2601 100644 --- a/crates/compiler/test_mono/src/tests.rs +++ b/crates/compiler/test_mono/src/tests.rs @@ -1458,7 +1458,7 @@ fn encode_custom_type() { |> Encode.appendWith (Encode.string "Hello, World!\n") fmt main = - result = Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.format) + result = Str.fromUtf8 (Encode.toBytes (@HelloWorld {}) Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1475,7 +1475,7 @@ fn encode_derived_string() { provides [main] to "./platform" main = - result = Str.fromUtf8 (Encode.toBytes "abc" Json.format) + result = Str.fromUtf8 (Encode.toBytes "abc" Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1493,7 +1493,7 @@ fn encode_derived_record() { provides [main] to "./platform" main = - result = Str.fromUtf8 (Encode.toBytes {a: "a"} Json.format) + result = Str.fromUtf8 (Encode.toBytes {a: "a"} Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1807,7 +1807,7 @@ fn encode_derived_record_one_field_string() { provides [main] to "./platform" main = - result = Str.fromUtf8 (Encode.toBytes {a: "foo"} Json.format) + result = Str.fromUtf8 (Encode.toBytes {a: "foo"} Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1824,7 +1824,7 @@ fn encode_derived_record_two_field_strings() { provides [main] to "./platform" main = - result = Str.fromUtf8 (Encode.toBytes {a: "foo", b: "bar"} Json.format) + result = Str.fromUtf8 (Encode.toBytes {a: "foo", b: "bar"} Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1841,7 +1841,7 @@ fn encode_derived_nested_record_string() { provides [main] to "./platform" main = - result = Str.fromUtf8 (Encode.toBytes {a: {b: "bar"}} Json.format) + result = Str.fromUtf8 (Encode.toBytes {a: {b: "bar"}} Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1860,7 +1860,7 @@ fn encode_derived_tag_one_field_string() { main = x : [A Str] x = A "foo" - result = Str.fromUtf8 (Encode.toBytes x Json.format) + result = Str.fromUtf8 (Encode.toBytes x Json.toUtf8) when result is Ok s -> s _ -> "" @@ -1879,7 +1879,7 @@ fn encode_derived_tag_two_payloads_string() { main = x : [A Str Str] x = A "foo" "foo" - result = Str.fromUtf8 (Encode.toBytes x Json.format) + result = Str.fromUtf8 (Encode.toBytes x Json.toUtf8) when result is Ok s -> s _ -> ""