Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid lossy OsString conversions

Browse source
This commit is contained in:
Laurențiu Nicola 2020-04-24 21:48:30 +03:00
parent 5d97667f8d
commit 58dde891f8
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir_expand/src/builtin_macro.rs
View file

@ -358,7 +358,7 @@ fn env_expand(
// However, we cannot use an empty string here, because for // However, we cannot use an empty string here, because for
// `include!(concat!(env!("OUT_DIR"), "/foo.rs"))` will become // `include!(concat!(env!("OUT_DIR"), "/foo.rs"))` will become
// `include!("foo.rs"), which might go to infinite loop // `include!("foo.rs"), which might go to infinite loop
let s = get_env_inner(db, arg_id, &key).unwrap_or("__RA_UNIMPLEMENTATED__".to_string()); let s = get_env_inner(db, arg_id, &key).unwrap_or_else(|| "__RA_UNIMPLEMENTATED__".to_string());
let expanded = quote! { #s }; let expanded = quote! { #s };
Ok((expanded, FragmentKind::Expr)) Ok((expanded, FragmentKind::Expr))

12
crates/ra_project_model/src/lib.rs
View file

@ -285,8 +285,10 @@ impl ProjectWorkspace {
let mut env = Env::default(); let mut env = Env::default();
let mut extern_source = ExternSource::default(); let mut extern_source = ExternSource::default();
if let Some(out_dir) = &krate.out_dir { if let Some(out_dir) = &krate.out_dir {
// FIXME: We probably mangle non UTF-8 paths here, figure out a better solution // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
env.set("OUT_DIR", out_dir.to_string_lossy().to_string()); 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) { if let Some(&extern_source_id) = extern_source_roots.get(out_dir) {
extern_source.set_extern_path(&out_dir, extern_source_id); extern_source.set_extern_path(&out_dir, extern_source_id);
} }
@ -402,8 +404,10 @@ impl ProjectWorkspace {
let mut env = Env::default(); let mut env = Env::default();
let mut extern_source = ExternSource::default(); let mut extern_source = ExternSource::default();
if let Some(out_dir) = &cargo[pkg].out_dir { if let Some(out_dir) = &cargo[pkg].out_dir {
// FIXME: We probably mangle non UTF-8 paths here, figure out a better solution // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
env.set("OUT_DIR", out_dir.to_string_lossy().to_string()); 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) { if let Some(&extern_source_id) = extern_source_roots.get(out_dir) {
extern_source.set_extern_path(&out_dir, extern_source_id); extern_source.set_extern_path(&out_dir, extern_source_id);
} }

2
crates/rust-analyzer/src/main_loop.rs
View file

@ -696,7 +696,7 @@ fn on_diagnostic_task(task: DiagnosticTask, msg_sender: &Sender<Message>, state:
let uri = match url_from_path_with_drive_lowercasing(&path) { let uri = match url_from_path_with_drive_lowercasing(&path) {
Ok(uri) => uri, Ok(uri) => uri,
Err(err) => { Err(err) => {
log::error!("Couldn't convert path to url ({}): {:?}", err, path.to_string_lossy()); log::error!("Couldn't convert path to url ({}): {}", err, path.display());
continue; continue;
} }
}; };

4
crates/rust-analyzer/src/main_loop/handlers.rs
View file

@ -384,7 +384,7 @@ pub fn handle_runnables(
args: check_args, args: check_args,
extra_args: Vec::new(), extra_args: Vec::new(),
env: FxHashMap::default(), env: FxHashMap::default(),
cwd: workspace_root.map(|root| root.to_string_lossy().to_string()), cwd: workspace_root.map(|root| root.to_owned()),
}); });
Ok(res) Ok(res)
} }
@ -984,7 +984,7 @@ fn to_lsp_runnable(
m.insert("RUST_BACKTRACE".to_string(), "short".to_string()); m.insert("RUST_BACKTRACE".to_string(), "short".to_string());
m m
}, },
cwd: world.workspace_root_for(file_id).map(|root| root.to_string_lossy().to_string()), cwd: world.workspace_root_for(file_id).map(|root| root.to_owned()),
}) })
} }

3
crates/rust-analyzer/src/req.rs
View file

@ -17,6 +17,7 @@ pub use lsp_types::{
SignatureHelp, SymbolKind, TextDocumentEdit, TextDocumentPositionParams, TextEdit, SignatureHelp, SymbolKind, TextDocumentEdit, TextDocumentPositionParams, TextEdit,
WorkDoneProgressParams, WorkspaceEdit, WorkspaceSymbolParams, WorkDoneProgressParams, WorkspaceEdit, WorkspaceSymbolParams,
}; };
use std::path::PathBuf;
pub enum AnalyzerStatus {} pub enum AnalyzerStatus {}
@ -141,7 +142,7 @@ pub struct Runnable {
pub args: Vec<String>, pub args: Vec<String>,
pub extra_args: Vec<String>, pub extra_args: Vec<String>,
pub env: FxHashMap<String, String>, pub env: FxHashMap<String, String>,
pub cwd: Option<String>, pub cwd: Option<PathBuf>,
} }
#[derive(Deserialize, Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]