diff options
Diffstat (limited to 'src/install/install.zig')
| -rw-r--r-- | src/install/install.zig | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/src/install/install.zig b/src/install/install.zig index 65f4a35e9..a71ad6a5a 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -151,8 +151,8 @@ pub fn ExternalSliceAligned(comptime Type: type, comptime alignment_: ?u29) type // } return Slice{ - .off = @truncate(u32, (@intFromPtr(in.ptr) - @intFromPtr(buf.ptr)) / @sizeOf(Type)), - .len = @truncate(u32, in.len), + .off = @as(u32, @truncate((@intFromPtr(in.ptr) - @intFromPtr(buf.ptr)) / @sizeOf(Type))), + .len = @as(u32, @truncate(in.len)), }; } }; @@ -346,12 +346,12 @@ const NetworkTask = struct { try header_builder.entries.append( allocator, .{ - .name = .{ .offset = 0, .length = @truncate(u32, "Accept".len) }, - .value = .{ .offset = "Accept".len, .length = @truncate(u32, default_headers_buf.len - "Accept".len) }, + .name = .{ .offset = 0, .length = @as(u32, @truncate("Accept".len)) }, + .value = .{ .offset = "Accept".len, .length = @as(u32, @truncate(default_headers_buf.len - "Accept".len)) }, }, ); header_builder.header_count = 1; - header_builder.content = GlobalStringBuilder{ .ptr = @ptrFromInt([*]u8, @intFromPtr(bun.span(default_headers_buf).ptr)), .len = default_headers_buf.len, .cap = default_headers_buf.len }; + header_builder.content = GlobalStringBuilder{ .ptr = @as([*]u8, @ptrFromInt(@intFromPtr(bun.span(default_headers_buf).ptr))), .len = default_headers_buf.len, .cap = default_headers_buf.len }; } this.response_buffer = try MutableString.init(allocator, 0); @@ -479,7 +479,7 @@ pub const Features = struct { out |= @as(u8, @intFromBool(this.dev_dependencies)) << 3; out |= @as(u8, @intFromBool(this.peer_dependencies)) << 4; out |= @as(u8, @intFromBool(this.workspaces)) << 5; - return @enumFromInt(Behavior, out); + return @as(Behavior, @enumFromInt(out)); } pub const main = Features{ @@ -545,28 +545,28 @@ const Task = struct { hasher.update(package_name); hasher.update("@"); hasher.update(std.mem.asBytes(&package_version)); - return @as(u64, 0 << 61) | @as(u64, @truncate(u61, hasher.final())); + return @as(u64, 0 << 61) | @as(u64, @as(u61, @truncate(hasher.final()))); } pub fn forBinLink(package_id: PackageID) u64 { const hash = bun.Wyhash.hash(0, std.mem.asBytes(&package_id)); - return @as(u64, 1 << 61) | @as(u64, @truncate(u61, hash)); + return @as(u64, 1 << 61) | @as(u64, @as(u61, @truncate(hash))); } pub fn forManifest(name: string) u64 { - return @as(u64, 2 << 61) | @as(u64, @truncate(u61, bun.Wyhash.hash(0, name))); + return @as(u64, 2 << 61) | @as(u64, @as(u61, @truncate(bun.Wyhash.hash(0, name)))); } pub fn forTarball(url: string) u64 { var hasher = bun.Wyhash.init(0); hasher.update(url); - return @as(u64, 3 << 61) | @as(u64, @truncate(u61, hasher.final())); + return @as(u64, 3 << 61) | @as(u64, @as(u61, @truncate(hasher.final()))); } pub fn forGitClone(url: string) u64 { var hasher = bun.Wyhash.init(0); hasher.update(url); - return @as(u64, 4 << 61) | @as(u64, @truncate(u61, hasher.final())); + return @as(u64, 4 << 61) | @as(u64, @as(u61, @truncate(hasher.final()))); } pub fn forGitCheckout(url: string, resolved: string) u64 { @@ -574,7 +574,7 @@ const Task = struct { hasher.update(url); hasher.update("@"); hasher.update(resolved); - return @as(u64, 5 << 61) | @as(u64, @truncate(u61, hasher.final())); + return @as(u64, 5 << 61) | @as(u64, @as(u61, @truncate(hasher.final()))); } }; @@ -1408,7 +1408,7 @@ const PackageInstall = struct { const rc = Syscall.system.open(path, @as(u32, std.os.O.PATH | 0), @as(u32, 0)); switch (Syscall.getErrno(rc)) { .SUCCESS => { - const fd = @intCast(std.os.fd_t, rc); + const fd = @as(std.os.fd_t, @intCast(rc)); _ = Syscall.system.close(fd); return false; }, @@ -1746,7 +1746,7 @@ pub const PackageManager = struct { version_buf: []const u8, behavior: Dependency.Behavior, ) DependencyToEnqueue { - const dep_id = @truncate(DependencyID, brk: { + const dep_id = @as(DependencyID, @truncate(brk: { const str_buf = this.lockfile.buffers.string_bytes.items; for (this.lockfile.buffers.dependencies.items, 0..) |dep, id| { if (!strings.eqlLong(dep.name.slice(str_buf), name, true)) continue; @@ -1772,7 +1772,7 @@ pub const PackageManager = struct { this.lockfile.buffers.resolutions.append(this.allocator, invalid_package_id) catch unreachable; if (comptime Environment.allow_assert) std.debug.assert(this.lockfile.buffers.dependencies.items.len == this.lockfile.buffers.resolutions.items.len); break :brk index; - }); + })); if (this.lockfile.buffers.resolutions.items[dep_id] == invalid_package_id) { this.enqueueDependencyWithMainAndSuccessFn( @@ -2806,7 +2806,7 @@ pub const PackageManager = struct { tmpname_buf[0..8].* = "tmplock-".*; var tmpfile = FileSystem.RealFS.Tmpfile{}; var secret: [32]u8 = undefined; - std.mem.writeIntNative(u64, secret[0..8], @intCast(u64, std.time.milliTimestamp())); + std.mem.writeIntNative(u64, secret[0..8], @as(u64, @intCast(std.time.milliTimestamp()))); var base64_bytes: [64]u8 = undefined; std.crypto.random.bytes(&base64_bytes); @@ -3340,8 +3340,8 @@ pub const PackageManager = struct { pub fn scheduleTasks(manager: *PackageManager) usize { const count = manager.task_batch.len + manager.network_resolve_batch.len + manager.network_tarball_batch.len; - manager.pending_tasks += @truncate(u32, count); - manager.total_tasks += @truncate(u32, count); + manager.pending_tasks += @as(u32, @truncate(count)); + manager.total_tasks += @as(u32, @truncate(count)); manager.thread_pool.schedule(manager.task_batch); manager.network_resolve_batch.push(manager.network_tarball_batch); HTTP.http_thread.schedule(manager.network_resolve_batch); @@ -3799,7 +3799,7 @@ pub const PackageManager = struct { if (comptime log_level.isVerbose()) { Output.prettyError(" ", .{}); - Output.printElapsed(@floatFromInt(f64, task.http.elapsed) / std.time.ns_per_ms); + Output.printElapsed(@as(f64, @floatFromInt(task.http.elapsed)) / std.time.ns_per_ms); Output.prettyError("\n <d>Downloaded <r><green>{s}<r> versions\n", .{name.slice()}); Output.flush(); } @@ -3811,7 +3811,7 @@ pub const PackageManager = struct { entry.value_ptr.* = manifest; if (timestamp_this_tick == null) { - timestamp_this_tick = @truncate(u32, @intCast(u64, @max(0, std.time.timestamp()))) +| 300; + timestamp_this_tick = @as(u32, @truncate(@as(u64, @intCast(@max(0, std.time.timestamp()))))) +| 300; } entry.value_ptr.*.pkg.public_max_age = timestamp_this_tick.?; @@ -3933,7 +3933,7 @@ pub const PackageManager = struct { if (comptime log_level.isVerbose()) { Output.prettyError(" ", .{}); - Output.printElapsed(@floatCast(f64, @floatFromInt(f64, task.http.elapsed) / std.time.ns_per_ms)); + Output.printElapsed(@as(f64, @floatCast(@as(f64, @floatFromInt(task.http.elapsed)) / std.time.ns_per_ms))); Output.prettyError(" <d>Downloaded <r><green>{s}<r> tarball\n", .{extract.name.slice()}); Output.flush(); } @@ -5219,7 +5219,7 @@ pub const PackageManager = struct { Output.flush(); } - var cpu_count = @truncate(u32, ((try std.Thread.getCpuCount()) + 1)); + var cpu_count = @as(u32, @truncate(((try std.Thread.getCpuCount()) + 1))); if (env.map.get("GOMAXPROCS")) |max_procs| { if (std.fmt.parseInt(u32, max_procs, 10)) |cpu_count_| { @@ -5275,7 +5275,7 @@ pub const PackageManager = struct { ctx.install, ); - manager.timestamp_for_manifest_cache_control = @truncate(u32, @intCast(u64, @max(std.time.timestamp(), 0))); + manager.timestamp_for_manifest_cache_control = @as(u32, @truncate(@as(u64, @intCast(@max(std.time.timestamp(), 0))))); return manager; } @@ -5290,7 +5290,7 @@ pub const PackageManager = struct { PackageManager.verbose_install = true; } - var cpu_count = @truncate(u32, ((try std.Thread.getCpuCount()) + 1)); + var cpu_count = @as(u32, @truncate(((try std.Thread.getCpuCount()) + 1))); if (env.map.get("GOMAXPROCS")) |max_procs| { if (std.fmt.parseInt(u32, max_procs, 10)) |cpu_count_| { @@ -5360,15 +5360,15 @@ pub const PackageManager = struct { bun_install, ); - manager.timestamp_for_manifest_cache_control = @truncate( + manager.timestamp_for_manifest_cache_control = @as( u32, - @intCast( + @truncate(@as( u64, - @max( + @intCast(@max( std.time.timestamp(), 0, - ), - ), + )), + )), // When using "bun install", we check for updates with a 300 second cache. // When using bun, we only do staleness checks once per day ) -| std.time.s_per_day; @@ -6101,15 +6101,15 @@ pub const PackageManager = struct { if (manager.options.positionals.len == 1) { var examples_to_print: [3]string = undefined; - const off = @intCast(u64, std.time.milliTimestamp()); + const off = @as(u64, @intCast(std.time.milliTimestamp())); switch (op) { .update, .add => { const filler = @import("../cli.zig").HelpCommand.packages_to_add_filler; - examples_to_print[0] = filler[@intCast(usize, (off) % filler.len)]; - examples_to_print[1] = filler[@intCast(usize, (off + 1) % filler.len)]; - examples_to_print[2] = filler[@intCast(usize, (off + 2) % filler.len)]; + examples_to_print[0] = filler[@as(usize, @intCast((off) % filler.len))]; + examples_to_print[1] = filler[@as(usize, @intCast((off + 1) % filler.len))]; + examples_to_print[2] = filler[@as(usize, @intCast((off + 2) % filler.len))]; Output.prettyErrorln( \\ @@ -6145,9 +6145,9 @@ pub const PackageManager = struct { .remove => { const filler = @import("../cli.zig").HelpCommand.packages_to_remove_filler; - examples_to_print[0] = filler[@intCast(usize, (off) % filler.len)]; - examples_to_print[1] = filler[@intCast(usize, (off + 1) % filler.len)]; - examples_to_print[2] = filler[@intCast(usize, (off + 2) % filler.len)]; + examples_to_print[0] = filler[@as(usize, @intCast((off) % filler.len))]; + examples_to_print[1] = filler[@as(usize, @intCast((off + 1) % filler.len))]; + examples_to_print[2] = filler[@as(usize, @intCast((off + 2) % filler.len))]; Output.prettyErrorln( \\ @@ -6308,7 +6308,7 @@ pub const PackageManager = struct { const changed = new_len != dependencies.len; if (changed) { - query.expr.data.e_object.properties.len = @truncate(u32, new_len); + query.expr.data.e_object.properties.len = @as(u32, @truncate(new_len)); // If the dependencies list is now empty, remove it from the package.json // since we're swapRemove, we have to re-sort it @@ -6781,7 +6781,7 @@ pub const PackageManager = struct { } } - if (resolution.tag == .workspace or this.lockfile.trusted_dependencies.contains(@truncate(u32, String.Builder.stringHash(name)))) { + if (resolution.tag == .workspace or this.lockfile.trusted_dependencies.contains(@as(u32, @truncate(String.Builder.stringHash(name))))) { var scripts = this.lockfile.packages.items(.scripts)[package_id]; if (scripts.hasAny()) { var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; @@ -7497,8 +7497,8 @@ pub const PackageManager = struct { new_dep.count(lockfile.buffers.string_bytes.items, *Lockfile.StringBuilder, builder); } - const off = @truncate(u32, manager.lockfile.buffers.dependencies.items.len); - const len = @truncate(u32, new_dependencies.len); + const off = @as(u32, @truncate(manager.lockfile.buffers.dependencies.items.len)); + const len = @as(u32, @truncate(new_dependencies.len)); var packages = manager.lockfile.packages.slice(); var dep_lists = packages.items(.dependencies); var resolution_lists = packages.items(.resolutions); @@ -7536,7 +7536,7 @@ pub const PackageManager = struct { if (manager.summary.add > 0 or manager.summary.update > 0) { var remaining = mapping; var dependency_i: PackageID = off; - const changes = @truncate(PackageID, mapping.len); + const changes = @as(PackageID, @truncate(mapping.len)); _ = manager.getCacheDirectory(); _ = manager.getTemporaryDirectory(); @@ -7763,7 +7763,7 @@ pub const PackageManager = struct { } if (needs_new_lockfile) { - manager.summary.add = @truncate(u32, manager.lockfile.packages.len); + manager.summary.add = @as(u32, @truncate(manager.lockfile.packages.len)); } if (manager.options.do.save_yarn_lock) { @@ -7812,9 +7812,9 @@ pub const PackageManager = struct { // it's confusing when it shows 3 packages and says it installed 1 Output.pretty("\n <green>{d}<r> packages<r> installed ", .{@max( install_summary.success, - @truncate( + @as( u32, - manager.package_json_updates.len, + @truncate(manager.package_json_updates.len), ), )}); Output.printStartEndStdout(ctx.start_time, std.time.nanoTimestamp()); @@ -7838,7 +7838,7 @@ pub const PackageManager = struct { } else if (install_summary.skipped > 0 and install_summary.fail == 0 and manager.package_json_updates.len == 0) { Output.pretty("\n", .{}); - const count = @truncate(PackageID, manager.lockfile.packages.len); + const count = @as(PackageID, @truncate(manager.lockfile.packages.len)); if (count != install_summary.skipped) { Output.pretty("Checked <green>{d} installs<r> across {d} packages <d>(no changes)<r> ", .{ install_summary.skipped, |