Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CompileCheck.zig
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ source_content: []const u8,
source_path: std.Build.LazyPath,
result: ?Result = null,

include_dirs: std.ArrayListUnmanaged(std.Build.Module.IncludeDir) = .{},
link_objects: std.ArrayListUnmanaged(std.Build.Module.LinkObject) = .{},
include_dirs: std.ArrayList(std.Build.Module.IncludeDir) = .empty,
link_objects: std.ArrayList(std.Build.Module.LinkObject) = .empty,

const Result = union(enum) {
pass,
Expand Down
2 changes: 1 addition & 1 deletion build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ fn addPythonExe(
const module_compile_args = try std.Io.Dir.cwd().readFileAlloc(io, file_path, step.owner.allocator, .unlimited);
defer step.owner.allocator.free(module_compile_args);

var files: std.ArrayListUnmanaged([]const u8) = .{};
var files: std.ArrayList([]const u8) = .empty;
defer files.deinit(step.owner.allocator);

var line_it = std.mem.splitScalar(u8, module_compile_args, '\n');
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.name = .cpython,
.fingerprint = 0x3224901d1babdd14,
.version = "0.1.0",
.minimum_zig_version = "0.16.0-dev.2682+02142a54d",
.minimum_zig_version = "0.16.0",
.dependencies = .{
.@"upstream_3.11.13" = .{
.url = "git+https://github.com/python/cpython#498b971ea3673012a1d4b21860b229d55fc6e575",
Expand Down
8 changes: 4 additions & 4 deletions makesetup.zig
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ fn parseSetupFile(
if (!valid_name) errExit("{s}:{}: invalid module name '{s}'", .{ file_path, lineno, name });
}

var defines: std.ArrayListUnmanaged([]const u8) = .{};
var compile_args: std.ArrayListUnmanaged(CompileArg) = .{};
var libraries: std.ArrayListUnmanaged([]const u8) = .{};
var libs: std.ArrayListUnmanaged([]const u8) = .{};
var defines: std.ArrayList([]const u8) = .empty;
var compile_args: std.ArrayList(CompileArg) = .empty;
var libraries: std.ArrayList([]const u8) = .empty;
var libs: std.ArrayList([]const u8) = .empty;
while (parts.next()) |part| {
if (std.mem.startsWith(u8, part, "$")) {
// seems ok to ignore these for now
Expand Down
Loading