From: Rob Tsuk <robtsuk@google.com>
Date: Tue, 13 Mar 2018 23:03:30 +0000 (-0700)
Subject: Return errors instead of ignoring them
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~45^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7a918277cf30759ac9dfbf1587391b498b8099cd;p=cargo.git

Return errors instead of ignoring them
---

diff --git a/src/cargo/ops/cargo_rustc/output_depinfo.rs b/src/cargo/ops/cargo_rustc/output_depinfo.rs
index ef1a90242..13f82f2b1 100644
--- a/src/cargo/ops/cargo_rustc/output_depinfo.rs
+++ b/src/cargo/ops/cargo_rustc/output_depinfo.rs
@@ -71,17 +71,12 @@ pub fn output_depinfo<'a, 'b>(context: &mut Context<'a, 'b>, unit: &Unit<'a>) ->
     let mut visited = HashSet::new();
     let success = add_deps_for_unit(&mut deps, context, unit, &mut visited).is_ok();
     let basedir_string;
-    let basedir = match context.config.get_string("dep-info-basedir") {
-        Ok(config) => {
-            match config {
-                Some(value) => {
-                    basedir_string = value.val;
-                    Some(basedir_string.as_str())
-                }
-                None => None,
-            }
-        },
-        _ => None
+    let basedir = match context.config.get_string("dep-info-basedir")? {
+        Some(value) => {
+            basedir_string = value.val;
+            Some(basedir_string.as_str())
+        }
+        None => None,
     };
     for &(_, ref link_dst, _) in context.target_filenames(unit)?.iter() {
         if let Some(ref link_dst) = *link_dst {