Skip to content

Commit ee827d1

Browse files
committed
fix(vendor): Don't vendor builtins
1 parent 15e52f5 commit ee827d1

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/ops/cargo_vendor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ fn sync(
154154
.with_context(|| format!("failed to load lockfile for {}", ws.root().display()))?;
155155

156156
packages
157-
.get_many(resolve.iter())
157+
.get_many(resolve.iter().filter(|pkg| !pkg.source_id().is_builtin()))
158158
.with_context(|| format!("failed to download packages for {}", ws.root().display()))?;
159159

160-
for pkg in resolve.iter() {
160+
for pkg in resolve.iter().filter(|pkg| !pkg.source_id().is_builtin()) {
161161
let sid = source_replacement_cache.get(pkg.source_id())?;
162162

163163
// Don't vendor path crates since they're already in the repository

tests/testsuite/standard_lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ fn builtins_do_not_show_in_tree() {
513513
.run();
514514
}
515515

516-
#[ignore = "vendoring tries to vendor builtins, and fails"]
517516
#[cargo_test(build_std_mock)]
518517
fn builtins_are_not_vendored() {
519518
let setup = setup();

0 commit comments

Comments
 (0)