Skip to content

Commit d93d573

Browse files
committed
remove usage of deprecated std.mem functions
1 parent aa11cae commit d93d573

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

DiffMatchPatch.zig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ fn diffInternal(
136136
) DiffError!DiffList {
137137
const allocator = dmp.allocator;
138138
// Trim off common prefix (speedup).
139-
const common_prefix_length = std.mem.indexOfDiff(u8, before, after) orelse {
139+
const common_prefix_length = std.mem.findDiff(u8, before, after) orelse {
140140
// equality
141141
var diffs: DiffList = .empty;
142142
errdefer deinitDiffList(allocator, &diffs);
@@ -254,7 +254,7 @@ fn diffCompute(
254254
const long_text = if (before.len > after.len) before else after;
255255
const short_text = if (before.len > after.len) after else before;
256256

257-
if (std.mem.indexOf(u8, long_text, short_text)) |index| {
257+
if (std.mem.find(u8, long_text, short_text)) |index| {
258258
var diffs: DiffList = .empty;
259259
errdefer deinitDiffList(allocator, &diffs);
260260
// Shorter text is inside the longer text (speedup).
@@ -454,7 +454,7 @@ fn diffHalfMatchInternal(
454454
var best_short_text_b: []const u8 = "";
455455

456456
while (j < short_text.len and b: {
457-
j = @as(isize, @intCast(std.mem.indexOf(u8, short_text[@intCast(j + 1)..], seed) orelse break :b false)) + j + 1;
457+
j = @as(isize, @intCast(std.mem.find(u8, short_text[@intCast(j + 1)..], seed) orelse break :b false)) + j + 1;
458458
break :b true;
459459
}) {
460460
const prefix_length = diffCommonPrefix(long_text[i..], short_text[@intCast(j)..]);
@@ -840,7 +840,7 @@ fn diffLinesToCharsMunge(
840840
// TODO this can be handled with a Reader, avoiding all the manual splitting
841841
while (line_end < @as(isize, @intCast(text.len)) - 1) {
842842
line_end = b: {
843-
break :b @as(isize, @intCast(std.mem.indexOf(u8, text[@intCast(line_start)..], "\n") orelse
843+
break :b @as(isize, @intCast(std.mem.find(u8, text[@intCast(line_start)..], "\n") orelse
844844
break :b @intCast(text.len - 1))) + line_start;
845845
};
846846
var line = text[@intCast(line_start) .. @as(usize, @intCast(line_start)) + @as(usize, @intCast(line_end + 1 - line_start))];
@@ -1501,7 +1501,7 @@ fn diffCommonOverlap(text1_in: []const u8, text2_in: []const u8) usize {
15011501
var length: usize = 1;
15021502
while (true) {
15031503
const pattern = text1[text_length - length ..];
1504-
const found = std.mem.indexOf(u8, text2, pattern) orelse
1504+
const found = std.mem.find(u8, text2, pattern) orelse
15051505
return best;
15061506

15071507
length += found;

0 commit comments

Comments
 (0)