aboutsummaryrefslogtreecommitdiff
path: root/src/resolver/resolver.zig
diff options
context:
space:
mode:
authorGravatar Dylan Conway <35280289+dylan-conway@users.noreply.github.com> 2023-02-23 23:57:19 -0800
committerGravatar GitHub <noreply@github.com> 2023-02-23 23:57:19 -0800
commit3f04f8d0a653cf5decef2225c2044742b382718a (patch)
tree91eb6500834e3157ecb9ab208101aa368a1191c8 /src/resolver/resolver.zig
parentb5bdde28ed34070cbb1d34d13f414f4c513ee40d (diff)
downloadbun-3f04f8d0a653cf5decef2225c2044742b382718a.tar.gz
bun-3f04f8d0a653cf5decef2225c2044742b382718a.tar.zst
bun-3f04f8d0a653cf5decef2225c2044742b382718a.zip
Upgrade Zig (#2151)
* fixup * Upgrade Zig * Remove bad assertion * strings * bump * mode -> optimize * optimize * Linux build * Update bindgen.zig
Diffstat (limited to 'src/resolver/resolver.zig')
-rw-r--r--src/resolver/resolver.zig6
1 files changed, 3 insertions, 3 deletions
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;
},
}