language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Move dylib version stuff to proc-macro-srv

Browse source
This commit is contained in:
Lukas Wirth 2024-06-30 15:05:35 +02:00
parent 5374ebbf36
commit db15273d4d
8 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/proc-macro-srv/src/dylib.rs
View file

@ -1,5 +1,7 @@
//! Handles dynamic library loading for proc macro
mod version;
use std::{fmt, fs::File, io};
use libloading::Library;
@ -7,7 +9,7 @@ use memmap2::Mmap;
use object::Object;
use paths::{AbsPath, Utf8Path, Utf8PathBuf};
use proc_macro::bridge;
use proc_macro_api::{read_dylib_info, ProcMacroKind};
use proc_macro_api::ProcMacroKind;
use crate::ProcMacroSrvSpan;
@ -119,11 +121,14 @@ impl ProcMacroLibraryLibloading {
let abs_file: &AbsPath = file
.try_into()
.map_err(|_| invalid_data_err(format!("expected an absolute path, got {file}")))?;
let version_info = read_dylib_info(abs_file)?;
let version_info = version::read_dylib_info(abs_file)?;
let lib = load_library(file).map_err(invalid_data_err)?;
let proc_macros =
crate::proc_macros::ProcMacros::from_lib(&lib, symbol_name, version_info)?;
let proc_macros = crate::proc_macros::ProcMacros::from_lib(
&lib,
symbol_name,
&version_info.version_string,
)?;
Ok(ProcMacroLibraryLibloading { _lib: lib, proc_macros })
}
}