Skip to content

Commit a92dc05

Browse files
committed
Use readAlloc again
1 parent eb2b440 commit a92dc05

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

src/lsp.zig

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,18 +1339,7 @@ pub fn readJsonMessage(
13391339
allocator: std.mem.Allocator,
13401340
) (std.io.Reader.Error || std.mem.Allocator.Error || BaseProtocolHeader.ParseError)![]u8 {
13411341
const header: BaseProtocolHeader = try .parse(reader);
1342-
1343-
// Use `readAlloc` once https://github.com/ziglang/zig/issues/24443 has been resolved:
1344-
// return try reader.readAlloc(allocator, header.content_length);
1345-
1346-
const json_message = try allocator.alloc(u8, header.content_length);
1347-
errdefer allocator.free(json_message);
1348-
var writer: std.io.Writer = .fixed(json_message);
1349-
reader.streamExact(&writer, json_message.len) catch |err| switch (err) {
1350-
error.ReadFailed, error.EndOfStream => |e| return e,
1351-
error.WriteFailed => unreachable, // fixed buffer
1352-
};
1353-
return json_message;
1342+
return try reader.readAlloc(allocator, header.content_length);
13541343
}
13551344

13561345
test readJsonMessage {

0 commit comments

Comments
 (0)