Skip to content

Fix panic in cargo metadata with dep on bin #5558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix panic in cargo metadata with dep on bin #5558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 30 additions & 33 deletions src/cargo/ops/cargo_output_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fn metadata_full(ws: &Workspace, opt: &OutputMetadataOptions) -> CargoResult<Exp
&packages,
&resolve,
ws.current_opt().map(|pkg| pkg.package_id().clone()),
);
)?;
let packages = packages
.package_ids()
.map(|i| packages.get(i).map(|p| p.clone()))
Expand Down Expand Up @@ -130,37 +130,34 @@ impl MetadataResolve {
packages: &PackageSet,
resolve: &Resolve,
root: Option<PackageId>,
) -> MetadataResolve {
let nodes = resolve
.iter()
.map(|pkg| {
Node {
id: pkg.clone(),
dependencies: resolve.deps(pkg).map(|(dep, _)| dep.clone()).collect(),
deps: resolve
.deps(pkg)
.flat_map(|(id, deps)| {
let dep_name = packages.get(id).unwrap()
.lib_target().unwrap()
.crate_name();
deps.iter().map(|dep| {
Dependency {
id: id.clone(),
name: dep.rename().unwrap_or(&dep_name)
.to_owned(),
kind: dep.kind(),
}
}).collect::<Vec<_>>().into_iter()
})
.collect(),
features: resolve
.features_sorted(pkg)
.into_iter()
.map(|s| s.to_string())
.collect(),
}
})
.collect();
MetadataResolve { nodes, root }
) -> CargoResult<MetadataResolve> {
let mut nodes = Vec::new();
for pkg in resolve.iter() {
let mut deps = Vec::new();
for (id, resolve_deps) in resolve.deps(pkg) {
let dep_name = match packages.get(id)?.lib_target() {
Some(t) => t.crate_name(),
None => continue,
};
deps.extend(resolve_deps.iter().map(move |dep| {
Dependency {
id: id.clone(),
name: dep.rename().unwrap_or(&dep_name).to_owned(),
kind: dep.kind(),
}
}));
}
nodes.push(Node {
id: pkg.clone(),
dependencies: resolve.deps(pkg).map(|(dep, _)| dep.clone()).collect(),
deps,
features: resolve
.features_sorted(pkg)
.into_iter()
.map(|s| s.to_string())
.collect(),
});
}
Ok(MetadataResolve { nodes, root })
}
}
32 changes: 32 additions & 0 deletions tests/testsuite/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,3 +1248,35 @@ fn package_metadata() {
),
);
}

#[test]
fn bin_lib() {
let p = project("foo")
.file(
"foo/Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
"#,
)
.file("foo/src/main.rs", "")
.file(
"bar/Cargo.toml",
r#"
[package]
name = "bar"
version = "0.1.0"

[dependencies]
foo = { path = "../foo" }
"#,
)
.file("bar/src/lib.rs", "")
.build();

assert_that(
p.cargo("metadata").cwd(p.root().join("bar")),
execs().with_status(0),
);
}