Update Cargo

Author: Xanewok

Cargo.lock

@@ -29,7 +29,7 @@ rls-span = "0.5"
 rls-vfs = "0.8"
 rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
 
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "dba478b4f069d8433a715fe73f15f310f21b801d" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "626f0f40efd32e6b3dbade50cd53fdfaa08446ba" }
 cargo_metadata = "0.8"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "b245fbd0f2bdbd002611a45d0758f9be44eaf66b", optional = true }
 env_logger = "0.7"

Cargo.toml

@@ -151,10 +151,10 @@ impl CargoPlan {
         self.units.insert(key.clone(), unit.into());
 
         // Fetch and insert relevant unit dependencies to the forward dep graph.
-        let units = cx.dep_targets(&unit);
-        let dep_keys: HashSet<UnitKey> = units
+        let deps = cx.unit_deps(&unit);
+        let dep_keys: HashSet<UnitKey> = deps
             .iter()
-            .copied()
+            .map(|dep| dep.unit)
             // We might not want certain deps to be added transitively (e.g.
             // when creating only a sub-dep-graph, limiting the scope).
             .filter(|unit| filter(*unit))
@@ -175,8 +175,8 @@ impl CargoPlan {
         }
 
         // Recursively process other remaining forward dependencies.
-        for unit in units {
-            self.emplace_dep_with_filter(unit, cx, filter);
+        for dep in deps {
+            self.emplace_dep_with_filter(dep.unit, cx, filter);
         }
     }