Skip to content
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.

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

If the only path is a loop then counted as the shortest path. #12977

Merged
merged 2 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 23 additions & 9 deletions src/cargo/util/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,30 +128,32 @@ impl<'s, N: Eq + Ord + Clone + 's, E: Default + Clone + 's> Graph<N, E> {
{
let mut back_link = BTreeMap::new();
let mut queue = VecDeque::from([pkg]);
let mut bottom = None;
let mut last = pkg;

while let Some(p) = queue.pop_front() {
bottom = Some(p);
last = p;
let mut out_edges = true;
for (child, edge) in fn_edge(&self, p) {
bottom = None;
out_edges = false;
back_link.entry(child).or_insert_with(|| {
queue.push_back(child);
(p, edge)
});
}
if bottom.is_some() {
if out_edges {
break;
}
}

let mut result = Vec::new();
let mut next =
bottom.expect("the only path was a cycle, no dependency graph has this shape");
let mut next = last;
while let Some((p, e)) = back_link.remove(&next) {
result.push((next, Some(e)));
next = p;
}
result.push((next, None));
if result.iter().all(|(n, _)| n != &next) {
result.push((next, None));
}
result.reverse();
#[cfg(debug_assertions)]
{
Expand All @@ -165,8 +167,12 @@ impl<'s, N: Eq + Ord + Clone + 's, E: Default + Clone + 's> Graph<N, E> {
));
}
let last = result.last().unwrap().0;
// fixme: this may sometimes be wrong when there are cycles.
epage marked this conversation as resolved.
Show resolved Hide resolved
if !fn_edge(&self, last).next().is_none() {
let set: Vec<_> = result.iter().map(|(k, _)| k).collect();
if !fn_edge(&self, last)
epage marked this conversation as resolved.
Show resolved Hide resolved
.filter(|(e, _)| !set.contains(&e))
.next()
.is_none()
{
self.print_for_test();
unreachable!("The last element in the path should not have outgoing edges");
}
Expand All @@ -188,6 +194,14 @@ fn path_to_case() {
);
}

#[test]
fn path_to_self() {
// Extracted from #12941
let mut new: Graph<i32, ()> = Graph::new();
new.link(0, 0);
assert_eq!(new.path_to_bottom(&0), vec![(&0, Some(&()))]);
}

impl<N: Eq + Ord + Clone, E: Default + Clone> Default for Graph<N, E> {
fn default() -> Graph<N, E> {
Graph::new()
Expand Down
33 changes: 33 additions & 0 deletions tests/testsuite/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3555,6 +3555,39 @@ fn cyclic_dev() {
p.cargo("test --workspace").run();
}

#[cargo_test]
fn cyclical_dep_with_missing_feature() {
// Checks for error handling when a cyclical dev-dependency specify a
// feature that doesn't exist.
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"

[dev-dependencies]
foo = { path = ".", features = ["missing"] }
"#,
)
.file("src/lib.rs", "")
.build();
p.cargo("check")
.with_status(101)
.with_stderr(
"error: failed to select a version for `foo`.
... required by package `foo v0.1.0 ([..]/foo)`
versions that meet the requirements `*` are: 0.1.0

the package `foo` depends on `foo`, with features: `missing` but `foo` does not have these features.


failed to select a version for `foo` which could resolve this conflict",
)
.run();
}

#[cargo_test]
fn publish_a_crate_without_tests() {
Package::new("testless", "0.1.0")
Expand Down