Upgrade Cargo dependency from 0.20 to 0.32. (#189)

This upgrade allows this tool to package crates that use the 2018 Rust edition.

Author: pcwalton

cargo-apk/Cargo.lock

@@ -1,13 +1,18 @@
 [package]
 name = "cargo-apk"
-version = "0.4.2"
+version = "0.4.3"
 authors = ["Pierre Krieger <[email protected]>"]
 license = "MIT"
 description = "Cargo subcommand that allows you to build Android packages"
 repository = "https://github.com/tomaka/android-rs-glue/tree/master/cargo-apk"
 
 [dependencies]
-cargo = "0.20.0"
+clap = "2.31"
+failure = "0.1.2"
 rustc-serialize = "0.3.19"
 term = "0.4.4"
 toml = "0.1.28"
+
+[dependencies.cargo]
+git = "https://github.com/rust-lang/cargo.git"
+rev = "aab0a3385932c8f5453c4fcd69e23c82bbc1c921"

cargo-apk/Cargo.toml

@@ -81,16 +81,17 @@ pub fn load(workspace: &Workspace, flag_package: &Option<String>) -> Result<Andr
     // Find out the package requested by the user.
     let package = {
         let packages = Vec::from_iter(flag_package.iter().cloned());
-        let spec = ops::Packages::Packages(&packages);
+        let spec = ops::Packages::Packages(packages);
 
         match spec {
+            ops::Packages::Default => unreachable!("cargo apk supports single package only"),
             ops::Packages::All => unreachable!("cargo apk supports single package only"),
             ops::Packages::OptOut(_) => unreachable!("cargo apk supports single package only"),
             ops::Packages::Packages(xs) => match xs.len() {
                 0 => workspace.current()?,
                 1 => workspace.members()
-                    .find(|pkg| pkg.name() == xs[0])
-                    .ok_or_else(|| CargoError::from(format!("package `{}` is not a member of the workspace", xs[0])))?,
+                    .find(|pkg| *pkg.name() == xs[0])
+                    .ok_or_else(|| format_err!("package `{}` is not a member of the workspace", xs[0]))?,
                 _ => unreachable!("cargo apk supports single package only"),
             }
         }