diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2022-07-13 16:09:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 16:09:19 +0100 |
| commit | bfb082cda4a0235422e24c7add5d5ae0569456f8 (patch) | |
| tree | 2b66debdc539881ece2616a4502134620e299a67 /core/encoding | |
| parent | 37d04198ab73441510a8556abd1aa1b5a4615c9b (diff) | |
| parent | ae9d540c1c77bfc84a4fff964e218aebcb0c2680 (diff) | |
Merge pull request #1881 from odin-lang/strings-builder-cleanup
Rename strings.Builder procedures to be consistent with the rest of the core library
Diffstat (limited to 'core/encoding')
| -rw-r--r-- | core/encoding/entity/entity.odin | 8 | ||||
| -rw-r--r-- | core/encoding/entity/example/entity_example.odin | 2 | ||||
| -rw-r--r-- | core/encoding/json/marshal.odin | 4 | ||||
| -rw-r--r-- | core/encoding/xml/example/xml_example.odin | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/core/encoding/entity/entity.odin b/core/encoding/entity/entity.odin index e5831a75f..694fcdffc 100644 --- a/core/encoding/entity/entity.odin +++ b/core/encoding/entity/entity.odin @@ -25,8 +25,8 @@ import "core:strings" MAX_RUNE_CODEPOINT :: int(unicode.MAX_RUNE) -write_rune :: strings.write_rune_builder -write_string :: strings.write_string_builder +write_rune :: strings.write_rune +write_string :: strings.write_string Error :: enum u8 { None = 0, @@ -94,8 +94,8 @@ decode_xml :: proc(input: string, options := XML_Decode_Options{}, allocator := l := len(input) if l == 0 { return "", .None } - builder := strings.make_builder() - defer strings.destroy_builder(&builder) + builder := strings.builder_make() + defer strings.builder_destroy(&builder) t := Tokenizer{src=input} in_data := false diff --git a/core/encoding/entity/example/entity_example.odin b/core/encoding/entity/example/entity_example.odin index 6fc377f9d..6301eb263 100644 --- a/core/encoding/entity/example/entity_example.odin +++ b/core/encoding/entity/example/entity_example.odin @@ -8,7 +8,7 @@ import "core:time" doc_print :: proc(doc: ^xml.Document) { buf: strings.Builder - defer strings.destroy_builder(&buf) + defer strings.builder_destroy(&buf) w := strings.to_writer(&buf) xml.print(w, doc) diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index 14df4c127..54fab44c6 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -18,9 +18,9 @@ Marshal_Error :: union #shared_nil { } marshal :: proc(v: any, allocator := context.allocator) -> (data: []byte, err: Marshal_Error) { - b := strings.make_builder(allocator) + b := strings.builder_make(allocator) defer if err != nil { - strings.destroy_builder(&b) + strings.builder_destroy(&b) } marshal_to_builder(&b, v) or_return diff --git a/core/encoding/xml/example/xml_example.odin b/core/encoding/xml/example/xml_example.odin index f7e74840e..887b40764 100644 --- a/core/encoding/xml/example/xml_example.odin +++ b/core/encoding/xml/example/xml_example.odin @@ -84,7 +84,7 @@ example :: proc() { doc_hash :: proc(doc: ^xml.Document, print := false) -> (crc32: u32) { buf: strings.Builder - defer strings.destroy_builder(&buf) + defer strings.builder_destroy(&buf) w := strings.to_writer(&buf) xml.print(w, doc) |