From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 5 Apr 2018 13:22:37 +0000 (+0200)
Subject: Simplify retrieval of dependency data
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~36^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e357d174841c9e373ce3367918dda4feccee3fcb;p=cargo.git

Simplify retrieval of dependency data
---

diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs
index 1392aa36f..a824233f9 100644
--- a/src/cargo/core/summary.rs
+++ b/src/cargo/core/summary.rs
@@ -145,11 +145,12 @@ fn build_feature_map(
 
             // Find data for the referenced dependency...
             let dep_data = {
-                let dep_name = match val {
-                    Feature(_) => "",
-                    Crate(ref dep_name) | CrateFeature(ref dep_name, _) => dep_name,
-                };
-                dependencies.iter().find(|d| *d.name() == *dep_name)
+                match val {
+                    Feature(_) => None,
+                    Crate(ref dep_name) | CrateFeature(ref dep_name, _) => {
+                        dependencies.iter().find(|d| d.name() == *dep_name)
+                    }
+                }
             };
 
             match (&val, dep_data) {