From 0af42d560876c08bed61ecebf0b126c89dff0ee2 Mon Sep 17 00:00:00 2001 From: Victor Song Date: Wed, 24 May 2023 02:13:43 -0500 Subject: [PATCH 1/2] Replace nonexistent `std.sort.sort` with `std.mem.sort` --- src/Server.zig | 2 +- src/diff.zig | 2 +- src/features/document_symbol.zig | 2 +- src/features/folding_range.zig | 2 +- src/features/selection_range.zig | 2 +- tests/ErrorBuilder.zig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Server.zig b/src/Server.zig index 7d3d7bc..37379dc 100644 --- a/src/Server.zig +++ b/src/Server.zig @@ -1142,7 +1142,7 @@ fn inlayHintHandler(server: *Server, request: types.InlayHintParams) Error!?[]ty } }; - std.sort.sort(inlay_hints.InlayHint, hints, {}, helper.lessThan); + std.mem.sort(inlay_hints.InlayHint, hints, {}, helper.lessThan); var last_index: usize = 0; var last_position: types.Position = .{ .line = 0, .character = 0 }; diff --git a/src/diff.zig b/src/diff.zig index 5da6ced..ee0abf2 100644 --- a/src/diff.zig +++ b/src/diff.zig @@ -125,7 +125,7 @@ pub fn applyTextEdits( defer allocator.free(text_edits_sortable); std.mem.copy(types.TextEdit, text_edits_sortable, text_edits); - std.sort.sort(types.TextEdit, text_edits_sortable, {}, textEditLessThan); + std.mem.sort(types.TextEdit, text_edits_sortable, {}, textEditLessThan); var final_text = std.ArrayListUnmanaged(u8){}; errdefer final_text.deinit(allocator); diff --git a/src/features/document_symbol.zig b/src/features/document_symbol.zig index 1051810..f4cfad1 100644 --- a/src/features/document_symbol.zig +++ b/src/features/document_symbol.zig @@ -171,7 +171,7 @@ fn convertSymbols( const result = convertSymbolsInternal(from, &symbol_buffer, &mappings); // sort items based on their source position - std.sort.sort(IndexToPositionEntry, mappings.items, {}, IndexToPositionEntry.lessThan); + std.mem.sort(IndexToPositionEntry, mappings.items, {}, IndexToPositionEntry.lessThan); var last_index: usize = 0; var last_position: types.Position = .{ .line = 0, .character = 0 }; diff --git a/src/features/folding_range.zig b/src/features/folding_range.zig index 6423b86..5ccfa6c 100644 --- a/src/features/folding_range.zig +++ b/src/features/folding_range.zig @@ -93,7 +93,7 @@ const Builder = struct { } // sort mappings based on their source index - std.sort.sort(IndexToPositionEntry, mappings, {}, IndexToPositionEntry.lessThan); + std.mem.sort(IndexToPositionEntry, mappings, {}, IndexToPositionEntry.lessThan); var last_index: usize = 0; var last_position: types.Position = .{ .line = 0, .character = 0 }; diff --git a/src/features/selection_range.zig b/src/features/selection_range.zig index bfd98e6..5183f5d 100644 --- a/src/features/selection_range.zig +++ b/src/features/selection_range.zig @@ -37,7 +37,7 @@ pub fn generateSelectionRanges( } } - std.sort.sort(offsets.Loc, locs.items, {}, shorterLocsFirst); + std.mem.sort(offsets.Loc, locs.items, {}, shorterLocsFirst); { var i: usize = 0; while (i + 1 < locs.items.len) { diff --git a/tests/ErrorBuilder.zig b/tests/ErrorBuilder.zig index 945f81a..8cfe4f2 100644 --- a/tests/ErrorBuilder.zig +++ b/tests/ErrorBuilder.zig @@ -92,7 +92,7 @@ pub fn write(builder: *ErrorBuilder, writer: anytype, tty_config: std.debug.TTY. for (builder.files.keys(), builder.files.values()) |file_name, file| { if (file.messages.items.len == 0) continue; - std.sort.sort(MsgItem, file.messages.items, file.source, ErrorBuilder.lessThan); + std.mem.sort(MsgItem, file.messages.items, file.source, ErrorBuilder.lessThan); try writer.writeByte('\n'); if (builder.files.count() > 1) { From 2e3d66e46585fa5b66ebe9a729e2158da92643f7 Mon Sep 17 00:00:00 2001 From: Lee Cannon Date: Thu, 25 May 2023 17:13:10 +0100 Subject: [PATCH 2/2] update `std.debug.TTY` to `std.io.tty` --- tests/ErrorBuilder.zig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/ErrorBuilder.zig b/tests/ErrorBuilder.zig index 8cfe4f2..61a5039 100644 --- a/tests/ErrorBuilder.zig +++ b/tests/ErrorBuilder.zig @@ -88,7 +88,7 @@ pub fn clearMessages(builder: *ErrorBuilder) void { builder.message_count = 0; } -pub fn write(builder: *ErrorBuilder, writer: anytype, tty_config: std.debug.TTY.Config) !void { +pub fn write(builder: *ErrorBuilder, writer: anytype, tty_config: std.io.tty.Config) !void { for (builder.files.keys(), builder.files.values()) |file_name, file| { if (file.messages.items.len == 0) continue; @@ -116,15 +116,15 @@ pub fn write(builder: *ErrorBuilder, writer: anytype, tty_config: std.debug.TTY. .info => "info", .debug => "debug", }; - const color: std.debug.TTY.Color = switch (item.level) { - .err => .Red, - .warn => .Yellow, - .info => .White, - .debug => .White, + const color: std.io.tty.Color = switch (item.level) { + .err => .red, + .warn => .yellow, + .info => .white, + .debug => .white, }; try tty_config.setColor(writer, color); try writer.print(" {s}: ", .{level_txt}); - try tty_config.setColor(writer, .Reset); + try tty_config.setColor(writer, .reset); try writer.writeAll(item.message); } @@ -137,7 +137,7 @@ pub fn writeDebug(builder: *ErrorBuilder) void { std.debug.getStderrMutex().lock(); defer std.debug.getStderrMutex().unlock(); const stderr = std.io.getStdErr(); - const tty_config = std.debug.detectTTYConfig(stderr); + const tty_config = std.io.tty.detectConfig(stderr); // does zig trim the output or why is this needed? stderr.writeAll(" ") catch return; nosuspend builder.write(stderr.writer(), tty_config) catch return;