1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-20 23:24:09 +00:00

make zap master build with zig master

This commit is contained in:
Rene Schallner 2024-06-27 19:33:04 +02:00
parent 3f9c7d0f6b
commit fed9633121
5 changed files with 12 additions and 12 deletions

View file

@ -132,7 +132,7 @@ pub fn Basic(comptime Lookup: type, comptime kind: BasicAuthStrategy) type {
};
// we have decoded
// we can split
var it = std.mem.split(u8, decoded, ":");
var it = std.mem.splitScalar(u8, decoded, ':');
const user = it.next();
const pass = it.next();
if (user == null or pass == null) {

View file

@ -612,13 +612,13 @@ pub fn parseAcceptHeaders(self: *const Self, allocator: std.mem.Allocator) !Acce
var list = try AcceptHeaderList.initCapacity(allocator, comma_count + 1);
errdefer list.deinit();
var tok_iter = std.mem.tokenize(u8, accept_str, ", ");
var tok_iter = std.mem.splitSequence(u8, accept_str, ", ");
while (tok_iter.next()) |tok| {
var split_iter = std.mem.split(u8, tok, ";");
var split_iter = std.mem.splitScalar(u8, tok, ';');
const mimetype_str = split_iter.next().?;
const q_factor = q_factor: {
const q_factor_str = split_iter.next() orelse break :q_factor 1;
var eq_iter = std.mem.split(u8, q_factor_str, "=");
var eq_iter = std.mem.splitScalar(u8, q_factor_str, '=');
const q = eq_iter.next().?;
if (q[0] != 'q') break :q_factor 1;
const value = eq_iter.next() orelse break :q_factor 1;
@ -626,7 +626,7 @@ pub fn parseAcceptHeaders(self: *const Self, allocator: std.mem.Allocator) !Acce
break :q_factor parsed;
};
var type_split_iter = std.mem.split(u8, mimetype_str, "/");
var type_split_iter = std.mem.splitScalar(u8, mimetype_str, '/');
const mimetype_type_str = type_split_iter.next() orelse continue;
const mimetype_subtype_str = type_split_iter.next() orelse continue;

View file

@ -164,7 +164,7 @@ pub const ContentType = enum {
XHTML,
// TODO: more content types
pub const string_map = std.ComptimeStringMap(ContentType, .{
pub const string_map = std.StaticStringMap(ContentType).initComptime(.{
.{ "text/plain", .TEXT },
.{ "text/html", .HTML },
.{ "application/xml", .XML },

View file

@ -89,7 +89,7 @@ fn get_tag_annotation(allocator: std.mem.Allocator, tagname: []const u8) ![]cons
tagname,
};
const result = try std.ChildProcess.run(.{
const result = try std.process.Child.run(.{
.allocator = allocator,
.argv = &args,
});
@ -382,7 +382,7 @@ fn command_update_readme(allocator: std.mem.Allocator, tag: []const u8) !void {
// iterate over lines
var in_replace_block: bool = false;
var line_it = std.mem.split(u8, readme, "\n");
var line_it = std.mem.splitScalar(u8, readme, '\n');
while (line_it.next()) |line| {
if (in_replace_block) {
if (std.mem.startsWith(u8, line, REPLACE_END_MARKER)) {

View file

@ -71,7 +71,7 @@ pub const usage_pkg =
;
pub fn gitLatestTag(gpa: Allocator, pkg_dir: []const u8) ![]const u8 {
const result = try std.ChildProcess.run(.{
const result = try std.process.Child.run(.{
.allocator = gpa,
.argv = &.{
"git",
@ -97,7 +97,7 @@ pub fn gitLatestTag(gpa: Allocator, pkg_dir: []const u8) ![]const u8 {
}
pub fn gitFileList(gpa: Allocator, pkg_dir: []const u8) ![]const u8 {
const result = try std.ChildProcess.run(.{
const result = try std.process.Child.run(.{
.allocator = gpa,
.argv = &.{
"git",
@ -449,7 +449,7 @@ pub fn computePackageHashForFileList(
var wait_group: WaitGroup = .{};
defer wait_group.wait();
var it = std.mem.split(u8, file_list, "\n");
var it = std.mem.splitScalar(u8, file_list, '\n');
while (it.next()) |entry| {
if (entry.len > 0) {