rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: Fix proc-macro-srv search paths for Arch Linux

Browse Source
This commit is contained in:
Lukas Wirth
2022-11-18 23:32:26 +01:00
parent e162d5800a
commit 52bc15fc1f
3 changed files with 25 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/project-model/src/workspace.rs
View File

@@ -377,6 +377,21 @@ impl ProjectWorkspace {
} }
} }
pub fn find_sysroot_proc_macro_srv(&self) -> Option<AbsPathBuf> {
match self {
ProjectWorkspace::Cargo { sysroot: Some(sysroot), .. }
| ProjectWorkspace::Json { sysroot: Some(sysroot), .. } => {
let standalone_server_name =
format!("rust-analyzer-proc-macro-srv{}", std::env::consts::EXE_SUFFIX);
["libexec", "lib"]
.into_iter()
.map(|segment| sysroot.root().join(segment).join(&standalone_server_name))
.find(|server_path| std::fs::metadata(&server_path).is_ok())
}
_ => None,
}
}
/// Returns the roots for the current `ProjectWorkspace` /// Returns the roots for the current `ProjectWorkspace`
/// The return type contains the path and whether or not /// The return type contains the path and whether or not
/// the root is a member of the current workspace /// the root is a member of the current workspace

22
crates/rust-analyzer/src/cli/load_cargo.rs
View File

@@ -60,24 +60,12 @@ pub fn load_workspace(
}; };
let proc_macro_client = if load_config.with_proc_macro { let proc_macro_client = if load_config.with_proc_macro {
let mut path = AbsPathBuf::assert(std::env::current_exe()?); let (server_path, args): (_, &[_]) = match ws.find_sysroot_proc_macro_srv() {
let mut args = vec!["proc-macro"]; Some(server_path) => (server_path, &[]),
None => (AbsPathBuf::assert(std::env::current_exe()?), &["proc-macro"]),
};
if let ProjectWorkspace::Cargo { sysroot, .. } | ProjectWorkspace::Json { sysroot, .. } = ProcMacroServer::spawn(server_path, args).map_err(|e| e.to_string())
&ws
{
if let Some(sysroot) = sysroot.as_ref() {
let standalone_server_name =
format!("rust-analyzer-proc-macro-srv{}", std::env::consts::EXE_SUFFIX);
let server_path = sysroot.root().join("libexec").join(&standalone_server_name);
if std::fs::metadata(&server_path).is_ok() {
path = server_path;
args = vec![];
}
}
}
ProcMacroServer::spawn(path.clone(), args.clone()).map_err(|e| e.to_string())
} else { } else {
Err("proc macro server disabled".to_owned()) Err("proc macro server disabled".to_owned())
}; };

36
crates/rust-analyzer/src/reload.rs
View File

@@ -305,9 +305,6 @@ impl GlobalState {
let files_config = self.config.files(); let files_config = self.config.files();
let project_folders = ProjectFolders::new(&self.workspaces, &files_config.exclude); let project_folders = ProjectFolders::new(&self.workspaces, &files_config.exclude);
let standalone_server_name =
format!("rust-analyzer-proc-macro-srv{}", std::env::consts::EXE_SUFFIX);
if self.proc_macro_clients.is_empty() { if self.proc_macro_clients.is_empty() {
if let Some((path, path_manually_set)) = self.config.proc_macro_srv() { if let Some((path, path_manually_set)) = self.config.proc_macro_srv() {
tracing::info!("Spawning proc-macro servers"); tracing::info!("Spawning proc-macro servers");
@@ -315,40 +312,17 @@ impl GlobalState {
.workspaces .workspaces
.iter() .iter()
.map(|ws| { .map(|ws| {
let (path, args) = if path_manually_set { let (path, args): (_, &[_]) = if path_manually_set {
tracing::debug!( tracing::debug!(
"Pro-macro server path explicitly set: {}", "Pro-macro server path explicitly set: {}",
path.display() path.display()
); );
(path.clone(), vec![]) (path.clone(), &[])
} else { } else {
let mut sysroot_server = None; match ws.find_sysroot_proc_macro_srv() {
if let ProjectWorkspace::Cargo { sysroot, .. } Some(server_path) => (server_path, &[]),
| ProjectWorkspace::Json { sysroot, .. } = ws None => (path.clone(), &["proc-macro"]),
{
if let Some(sysroot) = sysroot.as_ref() {
let server_path = sysroot
.root()
.join("libexec")
.join(&standalone_server_name);
if std::fs::metadata(&server_path).is_ok() {
tracing::debug!(
"Sysroot proc-macro server exists at {}",
server_path.display()
);
sysroot_server = Some(server_path);
} else {
tracing::debug!(
"Sysroot proc-macro server does not exist at {}",
server_path.display()
);
}
}
} }
sysroot_server.map_or_else(
|| (path.clone(), vec!["proc-macro".to_owned()]),
|path| (path, vec![]),
)
}; };
tracing::info!(?args, "Using proc-macro server at {}", path.display(),); tracing::info!(?args, "Using proc-macro server at {}", path.display(),);