From: Andy Russell <arussell123@gmail.com>
Date: Fri, 2 Dec 2016 19:30:16 +0000 (-0500)
Subject: remove unnecessary match
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~91^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d98711b1b1ecaa9aea5a6891d219a21a6efceb2;p=cargo.git

remove unnecessary match
---

diff --git a/src/cargo/core/resolver/encode.rs b/src/cargo/core/resolver/encode.rs
index 6640e53e3..b0c6e280a 100644
--- a/src/cargo/core/resolver/encode.rs
+++ b/src/cargo/core/resolver/encode.rs
@@ -286,12 +286,11 @@ impl<'a, 'cfg> Encodable for WorkspaceResolve<'a, 'cfg> {
         }).map(Package::package_id);
 
         let encodable = ids.iter().filter_map(|&id| {
-            match root {
-                Some(ref root) if !(self.use_root_key && *root == id) => {
-                    Some(encodable_resolve_node(id, self.resolve))
-                },
-                _ => None,
+            if self.use_root_key && root.unwrap() == id {
+                return None
             }
+
+            Some(encodable_resolve_node(id, self.resolve))
         }).collect::<Vec<_>>();
 
         let mut metadata = self.resolve.metadata.clone();