From: Nick Cameron <ncameron@mozilla.com>
Date: Tue, 13 Dec 2016 06:33:05 +0000 (-1000)
Subject: Fix some rebasing errors
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~82^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d18e37b95f91811049bbd9629de209fbcd4889f;p=cargo.git

Fix some rebasing errors
---

diff --git a/src/bin/check.rs b/src/bin/check.rs
index 4e36b2999..6d449f8d5 100644
--- a/src/bin/check.rs
+++ b/src/bin/check.rs
@@ -84,7 +84,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         features: &options.flag_features,
         all_features: options.flag_all_features,
         no_default_features: options.flag_no_default_features,
-        spec: &options.flag_package,
+        spec: ops::Packages::Packages(&options.flag_package),
         mode: ops::CompileMode::Check,
         release: options.flag_release,
         filter: ops::CompileFilter::new(options.flag_lib,
diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index b44b3e025..4ff5e5118 100644
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -189,13 +189,13 @@ pub fn compile_ws<'a>(ws: &Workspace<'a>,
 
     let profiles = ws.profiles();
 
-    let pair = resolve_dependencies(ws,
-                                    source,
-                                    features,
-                                    all_features,
-                                    no_default_features,
-                                    &specs)?;
-    let (packages, resolve_with_overrides) = pair;
+    let resolve = resolve_dependencies(ws,
+                                       source,
+                                       features,
+                                       all_features,
+                                       no_default_features,
+                                       &spec)?;
+    let (spec, packages, resolve_with_overrides) = resolve;
 
     let mut pkgids = Vec::new();
     if spec.len() > 0 {