switch to modern paths

This commit is contained in:
Aleksey Kladov 2019-04-14 22:40:04 +03:00
parent e1a2649aff
commit 30a4099ea7

View file

@ -6,17 +6,17 @@ use ra_lsp_server::{Result, InitializationOptions};
use ra_prof; use ra_prof;
fn main() -> Result<()> { fn main() -> Result<()> {
::std::env::set_var("RUST_BACKTRACE", "short"); std::env::set_var("RUST_BACKTRACE", "short");
let logger = Logger::with_env_or_str("error").duplicate_to_stderr(Duplicate::All); let logger = Logger::with_env_or_str("error").duplicate_to_stderr(Duplicate::All);
match ::std::env::var("RA_INTERNAL_MODE") { match std::env::var("RA_INTERNAL_MODE") {
Ok(ref v) if v == "1" => logger.log_to_file().directory("log").start()?, Ok(ref v) if v == "1" => logger.log_to_file().directory("log").start()?,
_ => logger.start()?, _ => logger.start()?,
}; };
let prof_depth = match ::std::env::var("RA_PROFILE_DEPTH") { let prof_depth = match std::env::var("RA_PROFILE_DEPTH") {
Ok(ref d) => d.parse()?, Ok(ref d) => d.parse()?,
_ => 0, _ => 0,
}; };
let profile_allowed = match ::std::env::var("RA_PROFILE") { let profile_allowed = match std::env::var("RA_PROFILE") {
Ok(ref p) => p.split(";").map(String::from).collect(), Ok(ref p) => p.split(";").map(String::from).collect(),
_ => Vec::new(), _ => Vec::new(),
}; };
@ -36,7 +36,7 @@ fn main() -> Result<()> {
fn main_inner() -> Result<()> { fn main_inner() -> Result<()> {
let (receiver, sender, threads) = stdio_transport(); let (receiver, sender, threads) = stdio_transport();
let cwd = ::std::env::current_dir()?; let cwd = std::env::current_dir()?;
run_server(ra_lsp_server::server_capabilities(), receiver, sender, |params, r, s| { run_server(ra_lsp_server::server_capabilities(), receiver, sender, |params, r, s| {
let root = params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd); let root = params.root_uri.and_then(|it| it.to_file_path().ok()).unwrap_or(cwd);