diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fs.zig | 2 | ||||
| -rw-r--r-- | src/string_immutable.zig | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/fs.zig b/src/fs.zig index db0685936..0da1ed184 100644 --- a/src/fs.zig +++ b/src/fs.zig @@ -1100,7 +1100,7 @@ pub const PathName = struct { } if (comptime Environment.allow_assert) { - std.debug.assert(!strings.includes(self.base, "/")); + if (self.dir.len > 0) std.debug.assert(!strings.includes(self.base, "/")); } // /bar/foo.js -> foo diff --git a/src/string_immutable.zig b/src/string_immutable.zig index bc0b59ea0..f44afdce6 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -224,6 +224,16 @@ pub fn indexOfSigned(self: string, str: string) i32 { } pub inline fn lastIndexOfChar(self: string, char: u8) ?usize { + if (comptime Environment.isLinux) { + const memrchr = struct { + pub extern fn memrchr(ptr: [*]const u8, val: c_int, len: usize) ?[*]const u8; + }.memrchr; + const start = memrchr(self.ptr, char, self.len) orelse return null; + const i = @ptrToInt(start) - @ptrToInt(self.ptr); + std.debug.assert(i < self.len); + return @intCast(usize, i); + } + return std.mem.lastIndexOfScalar(u8, self, char); } |