notohh/rustlings
notohh/rustlings
1
0
Fork 0
mirror of https://github.com/notohh/rustlings.git synced 2024-11-22 14:02:22 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1904 from mo8it/lsp

Browse source 
Fix the sysroot path when it contains whitespaces
This commit is contained in:
liv 2024-03-18 18:43:07 +01:00 committed by GitHub
commit f3fdb07507
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/project.rs
View file

@ -2,7 +2,7 @@ use glob::glob;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::env; use std::env;
use std::error::Error; use std::error::Error;
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::process::Command; use std::process::Command;
/// Contains the structure of resulting rust-project.json file /// Contains the structure of resulting rust-project.json file
@ -79,21 +79,24 @@ impl RustAnalyzerProject {
.output()? .output()?
.stdout; .stdout;
let toolchain = String::from_utf8_lossy(&toolchain); let toolchain = String::from_utf8(toolchain)?;
let mut whitespace_iter = toolchain.split_whitespace(); let toolchain = toolchain.trim_end();
let toolchain = whitespace_iter.next().unwrap_or(&toolchain); println!("Determined toolchain: {toolchain}\n");
println!("Determined toolchain: {}\n", &toolchain); let Ok(path) = Path::new(toolchain)
self.sysroot_src = (std::path::Path::new(toolchain)
.join("lib") .join("lib")
.join("rustlib") .join("rustlib")
.join("src") .join("src")
.join("rust") .join("rust")
.join("library") .join("library")
.to_string_lossy()) .into_os_string()
.to_string(); .into_string()
else {
return Err("The sysroot path is invalid UTF8".into());
};
self.sysroot_src = path;
Ok(()) Ok(())
} }
} }