From: Rob Tsuk <robtsuk@google.com>
Date: Wed, 14 Mar 2018 15:11:41 +0000 (-0700)
Subject: Use get_path() instead of get_string()
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~45^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ad190ffa464e572fd71dbc2e2ab1c4693f98fee7;p=cargo.git

Use get_path() instead of get_string()
---

diff --git a/src/cargo/ops/cargo_rustc/output_depinfo.rs b/src/cargo/ops/cargo_rustc/output_depinfo.rs
index 399013f98..6daf58141 100644
--- a/src/cargo/ops/cargo_rustc/output_depinfo.rs
+++ b/src/cargo/ops/cargo_rustc/output_depinfo.rs
@@ -71,9 +71,10 @@ 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("build.dep-info-basedir")? {
+    let basedir = match context.config.get_path("build.dep-info-basedir")? {
         Some(value) => {
-            basedir_string = value.val;
+            basedir_string = value.val.as_os_str().to_str().
+              ok_or_else(|| internal("build.dep-info-basedir path not utf-8"))?.to_string();
             Some(basedir_string.as_str())
         }
         None => None,