mirror of
https://github.com/oven-sh/bun
synced 2026-02-16 22:01:47 +00:00
fix merge
This commit is contained in:
@@ -115,7 +115,6 @@ pub const AsyncModule = struct {
|
||||
.onPackageDownloadError = onPackageDownloadError,
|
||||
.progress_bar = true,
|
||||
},
|
||||
true,
|
||||
PackageManager.Options.LogLevel.default,
|
||||
) catch unreachable;
|
||||
} else {
|
||||
@@ -128,7 +127,6 @@ pub const AsyncModule = struct {
|
||||
.onPackageManifestError = onPackageManifestError,
|
||||
.onPackageDownloadError = onPackageDownloadError,
|
||||
},
|
||||
true,
|
||||
PackageManager.Options.LogLevel.default_no_progress,
|
||||
) catch unreachable;
|
||||
}
|
||||
|
||||
@@ -617,7 +617,7 @@ pub fn processSubtree(
|
||||
builder.resolutions[unresolved_dep_id] = pkg_id;
|
||||
}
|
||||
}
|
||||
for (dependency_lists[replace.id].items) |*placed_dep_id| {
|
||||
for (dependency_lists[replace.id.get()].items) |*placed_dep_id| {
|
||||
if (placed_dep_id.* == replace.dep_id) {
|
||||
placed_dep_id.* = dep_id;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user