From 65b7908e109c05f5808971e6ceaee22eceb7db7d Mon Sep 17 00:00:00 2001
From: MaulingMonkey <git@maulingmonkey.com>
Date: Thu, 20 Jul 2017 16:09:24 -0700
Subject: [PATCH] Handle unicode natvis paths, simplify extension check to a
 single if.

---
 src/librustc_trans/back/linker.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/librustc_trans/back/linker.rs b/src/librustc_trans/back/linker.rs
index 0afb354185c3..d3f2d5923a3b 100644
--- a/src/librustc_trans/back/linker.rs
+++ b/src/librustc_trans/back/linker.rs
@@ -484,14 +484,10 @@ impl<'a> Linker for MsvcLinker<'a> {
                 match entry {
                     Ok(entry) => {
                         let path = entry.path();
-                        if let Some(ext) = path.extension() {
-                            if ext == OsStr::new("natvis") {
-                                if let Some(natvis_path_str) = path.to_str() {
-                                    self.cmd.arg(&format!("/NATVIS:{}",natvis_path_str));
-                                } else {
-                                    self.sess.warn(&format!("natvis path not unicode: {:?}", path));
-                                }
-                            }
+                        if path.extension() == Some("natvis".as_ref()) {
+                            let mut arg = OsString::from("/NATVIS:");
+                            arg.push(path);
+                            self.cmd.arg(arg);
                         }
                     },
                     Err(err) => {