Skip to content

Commit

Permalink
cargo +stable fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
Eh2406 committed Mar 12, 2020
1 parent 39b168b commit bd4ae6e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 4 additions & 3 deletions src/cargo/core/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -610,9 +610,10 @@ fn activate(
if let Some((parent, dep)) = parent {
let parent_pid = parent.package_id();
// add a edge from candidate to parent in the parents graph
cx.parents.link(candidate_pid, parent_pid)
// and associate dep with that edge
.insert(dep.clone());
cx.parents
.link(candidate_pid, parent_pid)
// and associate dep with that edge
.insert(dep.clone());
if let Some(public_dependency) = cx.public_dependency.as_mut() {
public_dependency.add_edge(
candidate_pid,
Expand Down
4 changes: 1 addition & 3 deletions src/cargo/core/resolver/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,7 @@ unable to verify that `{0}` is the same as when the lockfile was generated
&self,
pkg: PackageId,
) -> impl Iterator<Item = (PackageId, &HashSet<Dependency>)> {
self.graph
.edges(&pkg)
.map(|(id, deps)| (*id, deps))
self.graph.edges(&pkg).map(|(id, deps)| (*id, deps))
}

pub fn replacement(&self, pkg: PackageId) -> Option<PackageId> {
Expand Down

0 comments on commit bd4ae6e

Please sign in to comment.