diff options
Diffstat (limited to '')
| -rw-r--r-- | src/resolver/package_json.zig | 12 | ||||
| -rw-r--r-- | src/resolver/resolver.zig | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index fb0c91b86..25b2ca673 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -1002,7 +1002,7 @@ pub const ExportsMap = struct { }, .e_array => |e_array| { var array = this.allocator.alloc(Entry, e_array.items.len) catch unreachable; - for (e_array.items.slice()) |item, i| { + for (e_array.items.slice(), 0..) |item, i| { array[i] = this.visit(item); } return Entry{ @@ -1025,7 +1025,7 @@ pub const ExportsMap = struct { var is_conditional_sugar = false; first_token.loc = expr.loc; first_token.len = 1; - for (e_obj.properties.slice()) |prop, i| { + for (e_obj.properties.slice(), 0..) |prop, i| { const key: string = prop.key.?.data.e_string.string(this.allocator) catch unreachable; const key_range: logger.Range = this.source.rangeOfString(prop.key.?.loc); @@ -1154,7 +1154,7 @@ pub const ExportsMap = struct { .map => { var slice = this.data.map.list.slice(); const keys = slice.items(.key); - for (keys) |key, i| { + for (keys, 0..) |key, i| { if (strings.eql(key, key_)) { return slice.items(.value)[i]; } @@ -1697,7 +1697,7 @@ pub const ESModule = struct { const slice = object.list.slice(); const keys = slice.items(.key); - for (keys) |key, i| { + for (keys, 0..) |key, i| { if (strings.eqlComptime(key, "default") or r.conditions.contains(key)) { if (r.debug_logs) |log| { log.addNoteFmt("The key \"{s}\" matched", .{key}); @@ -1852,7 +1852,7 @@ pub const ESModule = struct { var slices = map.list.slice(); var keys = slices.items(.key); var values = slices.items(.value); - for (keys) |key, i| { + for (keys, 0..) |key, i| { if (r.resolveTargetReverse(query, key, values[i], .exact)) |result| { return result; } @@ -1935,7 +1935,7 @@ pub const ESModule = struct { .map => |map| { const slice = map.list.slice(); const keys = slice.items(.key); - for (keys) |map_key, i| { + for (keys, 0..) |map_key, i| { if (strings.eqlComptime(map_key, "default") or r.conditions.contains(map_key)) { if (r.resolveTargetReverse(query, key, slice.items(.value)[i], kind)) |result| { return result; diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index 7be97a291..45c0262fd 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -709,7 +709,7 @@ pub const Resolver = struct { const original_order = r.extension_order; defer r.extension_order = original_order; r.extension_order = switch (kind) { - .url, .at_conditional, .at => std.mem.span(&options.BundleOptions.Defaults.CSSExtensionOrder), + .url, .at_conditional, .at => options.BundleOptions.Defaults.CSSExtensionOrder[0..], .entry_point, .stmt, .dynamic => r.opts.esm_extension_order, else => r.opts.extension_order, }; @@ -1577,7 +1577,7 @@ pub const Resolver = struct { string_buf = package_json.dependencies.source_buf; } - for (dependencies_list) |dependency, dependency_id| { + for (dependencies_list, 0..) |dependency, dependency_id| { const dep_name = dependency.name.slice(string_buf); if (dep_name.len == esm.name.len) { if (!strings.eqlLong(dep_name, esm.name, false)) { @@ -1839,7 +1839,7 @@ pub const Resolver = struct { error.FileNotFound => unreachable, else => { // TODO: handle this error better - r.log.addErrorFmt(null, logger.Loc.Empty, r.allocator, "Unable to open directory: {s}", .{std.mem.span(@errorName(err))}) catch unreachable; + r.log.addErrorFmt(null, logger.Loc.Empty, r.allocator, "Unable to open directory: {s}", .{bun.asByteSlice(@errorName(err))}) catch unreachable; return err; }, } |