From: James Bendig <jbendig@starbytesoftware.com>
Date: Mon, 27 Feb 2017 21:45:39 +0000 (-0600)
Subject: Fixed compile failing because Resolve::features() no longer returns an Option.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~127^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fbc00c6576110b7fa6442339927a811b648b7492;p=cargo.git

Fixed compile failing because Resolve::features() no longer returns an Option.
---

diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs
index 4c97cad33..756022dbc 100644
--- a/src/cargo/ops/cargo_rustc/context.rs
+++ b/src/cargo/ops/cargo_rustc/context.rs
@@ -639,16 +639,13 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
         // Integration tests/benchmarks require binaries to be built
         if unit.profile.test &&
            (unit.target.is_test() || unit.target.is_bench()) {
-            let no_features = HashSet::new();
-            let features = self.resolve.features(id).unwrap_or(&no_features);
-
             ret.extend(unit.pkg.targets().iter().filter(|t| {
                 let no_required_features = Vec::new();
 
                 t.is_bin() &&
                 // Skip binaries with required features that have not been selected.
                 t.required_features().unwrap_or(&no_required_features).iter().all(|f| {
-                    features.contains(f)
+                    self.resolve.features(id).contains(f)
                 })
             }).map(|t| {
                 Unit {