Merge #4125

4125: Avoid lossy OsString conversions r=matklad a=lnicola

This is a bit invasive, and perhaps for not much benefit since non-UTF-8 environment variables don't work anyway.

Co-authored-by: Laurențiu Nicola <[email protected]>

1 files changed, 8 insertions, 4 deletions

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 03f2629da..731cbd291 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -285,8 +285,10 @@ impl ProjectWorkspace {
                         let mut env = Env::default();
                         let mut extern_source = ExternSource::default();
                         if let Some(out_dir) = &krate.out_dir {
-                            // FIXME: We probably mangle non UTF-8 paths here, figure out a better solution
-                            env.set("OUT_DIR", out_dir.to_string_lossy().to_string());
+                            // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
+                            if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) {
+                                env.set("OUT_DIR", out_dir);
+                            }
                             if let Some(&extern_source_id) = extern_source_roots.get(out_dir) {
                                 extern_source.set_extern_path(&out_dir, extern_source_id);
                             }
@@ -402,8 +404,10 @@ impl ProjectWorkspace {
                             let mut env = Env::default();
                             let mut extern_source = ExternSource::default();
                             if let Some(out_dir) = &cargo[pkg].out_dir {
-                                // FIXME: We probably mangle non UTF-8 paths here, figure out a better solution
-                                env.set("OUT_DIR", out_dir.to_string_lossy().to_string());
+                                // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
+                                if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) {
+                                    env.set("OUT_DIR", out_dir);
+                                }
                                 if let Some(&extern_source_id) = extern_source_roots.get(out_dir) {
                                     extern_source.set_extern_path(&out_dir, extern_source_id);
                                 }