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

Fix proc-macro-test build script

Browse source
This commit is contained in:
Lukas Wirth 2024-06-30 16:26:39 +02:00
parent 2fb38ceb66
commit b0c4bc4972
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/proc-macro-srv/proc-macro-test/build.rs
View file

@ -30,8 +30,7 @@ fn main() {
if !has_features { if !has_features {
println!("proc-macro-test testing only works on nightly toolchains"); println!("proc-macro-test testing only works on nightly toolchains");
let info_path = out_dir.join("proc_macro_test_location.txt"); println!("cargo::rustc-env=PROC_MACRO_TEST_LOCATION=\"\"");
fs::File::create(info_path).unwrap();
return; return;
} }

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

@ -133,24 +133,32 @@ impl ProcMacroLibraryLibloading {
} }
} }
pub struct Expander { pub(crate) struct Expander {
inner: ProcMacroLibraryLibloading, inner: ProcMacroLibraryLibloading,
path: Utf8PathBuf,
}
impl Drop for Expander {
fn drop(&mut self) {
#[cfg(windows)]
std::fs::remove_file(&self.path).ok();
}
} }
impl Expander { impl Expander {
pub fn new(lib: &Utf8Path) -> Result<Expander, LoadProcMacroDylibError> { pub(crate) fn new(lib: &Utf8Path) -> Result<Expander, LoadProcMacroDylibError> {
// Some libraries for dynamic loading require canonicalized path even when it is // Some libraries for dynamic loading require canonicalized path even when it is
// already absolute // already absolute
let lib = lib.canonicalize_utf8()?; let lib = lib.canonicalize_utf8()?;
let lib = ensure_file_with_lock_free_access(&lib)?; let path = ensure_file_with_lock_free_access(&lib)?;
let library = ProcMacroLibraryLibloading::open(lib.as_ref())?; let library = ProcMacroLibraryLibloading::open(path.as_ref())?;
Ok(Expander { inner: library }) Ok(Expander { inner: library, path })
} }
pub fn expand<S: ProcMacroSrvSpan>( pub(crate) fn expand<S: ProcMacroSrvSpan>(
&self, &self,
macro_name: &str, macro_name: &str,
macro_body: tt::Subtree<S>, macro_body: tt::Subtree<S>,
@ -169,7 +177,7 @@ impl Expander {
result.map_err(|e| e.into_string().unwrap_or_default()) result.map_err(|e| e.into_string().unwrap_or_default())
} }
pub fn list_macros(&self) -> Vec<(String, ProcMacroKind)> { pub(crate) fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
self.inner.proc_macros.list_macros() self.inner.proc_macros.list_macros()
} }
} }
@ -198,7 +206,7 @@ fn ensure_file_with_lock_free_access(path: &Utf8Path) -> io::Result<Utf8PathBuf>
unique_name.push_str(file_name); unique_name.push_str(file_name);
to.push(unique_name); to.push(unique_name);
std::fs::copy(path, &to).unwrap(); std::fs::copy(path, &to)?;
Ok(to) Ok(to)
} }