From: Andy Russell <arussell123@gmail.com>
Date: Thu, 8 Dec 2016 22:32:33 +0000 (-0500)
Subject: replace `current_opt` with membership check
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~91^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=addbb7e5178d0575b6dc42436e56bbb8392f49be;p=cargo.git

replace `current_opt` with membership check
---

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index b1690755f..e0759ad81 100644
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -449,8 +449,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         // we don't want to link it up.
         if src_dir.ends_with("deps") {
             // Don't lift up library dependencies
-            if self.ws.current_opt().map_or(false, |p| unit.pkg.package_id() != p.package_id())
-                    && !unit.target.is_bin() {
+            if self.ws.members().find(|&p| p != unit.pkg).is_some() && !unit.target.is_bin() {
                 None
             } else {
                 Some((
diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index dff80e493..809437c64 100644
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -557,9 +557,7 @@ fn build_base_args(cx: &mut Context,
     let prefer_dynamic = (unit.target.for_host() &&
                           !unit.target.is_custom_build()) ||
                          (crate_types.contains(&"dylib") &&
-                          cx.ws.current_opt().map_or(false, |p| {
-                              *p.package_id() != *unit.pkg.package_id()
-                          }));
+                          cx.ws.members().find(|&p| p != unit.pkg).is_some());
     if prefer_dynamic {
         cmd.arg("-C").arg("prefer-dynamic");
     }