language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move version string to RustcInfo, read '.rustc' section only once

Browse source
This commit is contained in:
Amos Wenger 2022-07-21 13:57:36 +02:00
parent bbaf4daca0
commit 30769598a4
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/proc-macro-srv/src/abis/mod.rs
View file

@ -77,14 +77,13 @@ impl Abi {
lib: &Library,
symbol_name: String,
info: RustCInfo,
#[cfg_attr(not(feature = "sysroot-abi"), allow(unused_variables))] version_string: String,
) -> Result<Abi, LoadProcMacroDylibError> {
// the sysroot ABI relies on `extern proc_macro` with unstable features,
// instead of a snapshot of the proc macro bridge's source code. it's only
// enabled if we have an exact version match.
#[cfg(feature = "sysroot-abi")]
{
if version_string == RUSTC_VERSION_STRING {
if info.version_string == RUSTC_VERSION_STRING {
let inner = unsafe { Abi_Sysroot::from_lib(lib, symbol_name) }?;
return Ok(Abi::AbiSysroot(inner));
}
@ -104,7 +103,7 @@ impl Abi {
} else {
panic!(
"sysroot ABI mismatch: dylib rustc version (read from .rustc section): {:?} != proc-macro-srv version (read from 'rustc --version'): {:?}",
version_string, RUSTC_VERSION_STRING
info.version_string, RUSTC_VERSION_STRING
);
}
}