From: debris <marek.kotewicz@gmail.com>
Date: Sun, 30 Jul 2017 14:15:35 +0000 (+0200)
Subject: Removed redundant unwrap
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~7^2~39^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0275ca0604b556cb30d0ed0e460a6ca11244f37b;p=cargo.git

Removed redundant unwrap
---

diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
index 075006885..3cc736a2d 100644
--- a/src/cargo/ops/cargo_read_manifest.rs
+++ b/src/cargo/ops/cargo_read_manifest.rs
@@ -62,10 +62,9 @@ pub fn read_packages(path: &Path, source_id: &SourceId, config: &Config)
     })?;
 
     if all_packages.is_empty() {
-        if errors.is_empty() {
-            Err(format!("Could not find Cargo.toml in `{}`", path.display()).into())
-        } else {
-            Err(errors.pop().unwrap())
+        match errors.pop() {
+            Some(err) => Err(err),
+            None => Err(format!("Could not find Cargo.toml in `{}`", path.display()).into()),
         }
     } else {
         Ok(all_packages.into_iter().map(|(_, v)| v).collect())