Merge pull request #50 from kraai/cargo-0.32

Update to cargo 0.32
Nemo157 · Dec 17, 2018 · 98bd0e8 · 98bd0e8
2 parents d1c2687 + 18f7c33
commit 98bd0e8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ keywords = ["cargo", "licensing"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-cargo = "0.31"
+cargo = "0.32"
 clap = "2.20"
 failure = "0.1.2"
 regex = "0.2"

diff --git a/src/load.rs b/src/load.rs
@@ -24,7 +24,7 @@ pub fn resolve_roots(
         SelectedPackage::Specific(spec) => {
             let (packages, _) = ops::resolve_ws(&workspace)?;
             let package_id = spec.query(packages.package_ids())?;
-            vec![packages.get(package_id)?.clone()]
+            vec![packages.get_one(package_id)?.clone()]
         }
     })
 }
@@ -40,7 +40,7 @@ pub fn resolve_packages<'a, I: IntoIterator<Item=&'a Package>>(
     let mut result = HashSet::new();
     let mut to_check = roots.into_iter().map(|p| p.package_id()).collect::<Vec<_>>();
     while let Some(id) = to_check.pop() {
-        if let Ok(package) = packages.get(id) {
+        if let Ok(package) = packages.get_one(id) {
             if result.insert(package) {
                 let deps = resolve.deps_not_replaced(id);
                 for dep_id in deps {