From 5fa13625a1ca0ea1a3a1c5bb86d0880dcfac349f Mon Sep 17 00:00:00 2001 From: Dylan Conway <35280289+dylan-conway@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:38:18 -0700 Subject: upgrade zig to `v0.11.0-dev.3737+9eb008717` (#3374) * progress * finish `@memset/@memcpy` update * Update build.zig * change `@enumToInt` to `@intFromEnum` and friends * update zig versions * it was 1 * add link to issue * add `compileError` reminder * fix merge * format * upgrade to llvm 16 * Revert "upgrade to llvm 16" This reverts commit cc930ceb1c5b4db9614a7638596948f704544ab8. --------- Co-authored-by: Jarred Sumner Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> --- src/cli/package_manager_command.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cli/package_manager_command.zig') diff --git a/src/cli/package_manager_command.zig b/src/cli/package_manager_command.zig index 83d3dd023..0d92c4232 100644 --- a/src/cli/package_manager_command.zig +++ b/src/cli/package_manager_command.zig @@ -48,7 +48,7 @@ pub const PackageManagerCommand = struct { pub fn printHash(ctx: Command.Context, lockfile_: []const u8) !void { @setCold(true); var lockfile_buffer: [bun.MAX_PATH_BYTES]u8 = undefined; - @memcpy(&lockfile_buffer, lockfile_.ptr, lockfile_.len); + @memcpy(lockfile_buffer[0..lockfile_.len], lockfile_); lockfile_buffer[lockfile_.len] = 0; var lockfile = lockfile_buffer[0..lockfile_.len :0]; var pm = try PackageManager.init(ctx, null, PackageManager.Subcommand.pm); @@ -224,7 +224,7 @@ pub const PackageManagerCommand = struct { for (sorted_dependencies, 0..) |*dep, i| { dep.* = @truncate(DependencyID, root_deps.off + i); } - std.sort.sort(DependencyID, sorted_dependencies, ByName{ + std.sort.block(DependencyID, sorted_dependencies, ByName{ .dependencies = dependencies, .buf = string_bytes, }, ByName.isLessThan); @@ -336,7 +336,7 @@ fn printNodeModulesFolderStructure( const sorted_dependencies = try allocator.alloc(DependencyID, directory.dependencies.len); defer allocator.free(sorted_dependencies); bun.copy(DependencyID, sorted_dependencies, directory.dependencies); - std.sort.sort(DependencyID, sorted_dependencies, ByName{ + std.sort.block(DependencyID, sorted_dependencies, ByName{ .dependencies = dependencies, .buf = string_bytes, }, ByName.isLessThan); -- cgit v1.2.3