| ... | ... | @@ -155,7 +155,7 @@ pub const Mapping = struct { |
| 155 | 155 | return null; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | | pub fn getT(self: Mapping, k: string, comptime f: std.meta.FieldEnum(Value)) ?std.meta.FieldType(Value, f) { |
| 158 | pub fn getT(self: Mapping, k: string, comptime f: std.meta.FieldEnum(Value)) ?@FieldType(Value, @tagName(f)) { |
| 159 | 159 | for (self.items) |item| { |
| 160 | 160 | if (std.mem.eql(u8, item.key, k)) { |
| 161 | 161 | return @field(item.value, @tagName(f)); |
| ... | ... | @@ -169,7 +169,7 @@ pub const Mapping = struct { |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | pub fn get_string_array(self: Mapping, alloc: std.mem.Allocator, k: string) ![][:0]const u8 { |
| 172 | | var list = std.ArrayList([:0]const u8).init(alloc); |
| 172 | var list = std.array_list.Managed([:0]const u8).init(alloc); |
| 173 | 173 | errdefer list.deinit(); |
| 174 | 174 | if (self.get(k)) |val| { |
| 175 | 175 | if (val == .sequence) { |
| ... | ... | @@ -217,7 +217,7 @@ pub fn parse(alloc: std.mem.Allocator, input: string) !Document { |
| 217 | 217 | |
| 218 | 218 | _ = c.yaml_parser_set_input_string(&parser, input.ptr, input.len); |
| 219 | 219 | |
| 220 | | var all_events = std.ArrayList(Token).init(alloc); |
| 220 | var all_events = std.array_list.Managed(Token).init(alloc); |
| 221 | 221 | defer all_events.deinit(); |
| 222 | 222 | var event: Token = undefined; |
| 223 | 223 | while (true) { |
| ... | ... | @@ -282,7 +282,7 @@ fn parse_item(p: *Parser, start: ?Token) Error!Item { |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | fn parse_stream(p: *Parser) Error!Stream { |
| 285 | | var res = std.ArrayList(Document).init(p.alloc); |
| 285 | var res = std.array_list.Managed(Document).init(p.alloc); |
| 286 | 286 | errdefer res.deinit(); |
| 287 | 287 | errdefer for (res.items) |k| k.deinit(p.alloc); |
| 288 | 288 | |
| ... | ... | @@ -326,7 +326,7 @@ fn parse_document(p: *Parser) Error!Document { |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | fn parse_mapping(p: *Parser) Error!Mapping { |
| 329 | | var res = std.ArrayList(Key).init(p.alloc); |
| 329 | var res = std.array_list.Managed(Key).init(p.alloc); |
| 330 | 330 | errdefer res.deinit(); |
| 331 | 331 | errdefer for (res.items) |k| k.deinit(p.alloc); |
| 332 | 332 | |
| ... | ... | @@ -358,7 +358,7 @@ fn parse_value(p: *Parser) Error!Value { |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | fn parse_sequence(p: *Parser) Error!Sequence { |
| 361 | | var res = std.ArrayList(Item).init(p.alloc); |
| 361 | var res = std.array_list.Managed(Item).init(p.alloc); |
| 362 | 362 | errdefer res.deinit(); |
| 363 | 363 | errdefer for (res.items) |k| k.deinit(p.alloc); |
| 364 | 364 | |
| ... | ... | @@ -380,7 +380,7 @@ fn get_event_string(event: Token, p: *const Parser) ![:0]u8 { |
| 380 | 380 | if (starter.len != 1) return error.YamlInvalidMultilineString; |
| 381 | 381 | switch (starter[0]) { |
| 382 | 382 | '|' => { |
| 383 | | var list = std.ArrayList(u8).init(p.alloc); |
| 383 | var list = std.array_list.Managed(u8).init(p.alloc); |
| 384 | 384 | errdefer list.deinit(); |
| 385 | 385 | var i = sm.line + 1; |
| 386 | 386 | while (i < em.line) : (i += 1) { |
| ... | ... | @@ -403,7 +403,7 @@ fn get_event_string(event: Token, p: *const Parser) ![:0]u8 { |
| 403 | 403 | // |
| 404 | 404 | |
| 405 | 405 | fn split(alloc: std.mem.Allocator, in: string) ![]string { |
| 406 | | var list = std.ArrayList(string).init(alloc); |
| 406 | var list = std.array_list.Managed(string).init(alloc); |
| 407 | 407 | errdefer list.deinit(); |
| 408 | 408 | |
| 409 | 409 | var iter = std.mem.splitAny(u8, in, "\r\n"); |