Date: Monday, November 21, 2022 @ 20:48:54 Author: polyzen Revision: 1351404
upgpkg: rust-analyzer 20221121-1 Modified: rust-analyzer/trunk/PKGBUILD Deleted: rust-analyzer/trunk/rust-analyzer-support_standalone_server_in_lib.patch ------------------------------------------------------+ PKGBUILD | 12 +-- rust-analyzer-support_standalone_server_in_lib.patch | 64 ----------------- 2 files changed, 4 insertions(+), 72 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-21 20:45:50 UTC (rev 1351403) +++ PKGBUILD 2022-11-21 20:48:54 UTC (rev 1351404) @@ -2,9 +2,9 @@ # Contributor: Sergey A. <[email protected]> pkgname=rust-analyzer -_pkgver=2022-11-14 +_pkgver=2022-11-21 pkgver=${_pkgver//-} -pkgrel=3 +pkgrel=1 pkgdesc='Rust compiler front-end for IDEs' arch=('x86_64') url=https://rust-analyzer.github.io/ @@ -11,16 +11,12 @@ license=('Apache' 'MIT') depends=('gcc-libs' 'rust-src') makedepends=('git') -source=("git+https://github.com/rust-lang/$pkgname.git#tag=$_pkgver"; - 'rust-analyzer-support_standalone_server_in_lib.patch') -b2sums=('SKIP' - '48ddf95953a94fb701b240903fb8e6ebb275933fe1e3f023cab06b10abd3a8d307babfb172ea8b93f7fbebf3e61d2fe1c4bb45ca66e406dd823c4895d515432b') +source=("git+https://github.com/rust-lang/$pkgname.git#tag=$_pkgver";) +b2sums=('SKIP') prepare() { cd $pkgname cargo fetch --locked --target "$CARCH-unknown-linux-gnu" - - patch --forward --strip=1 --input=../rust-analyzer-support_standalone_server_in_lib.patch } build() { Deleted: rust-analyzer-support_standalone_server_in_lib.patch =================================================================== --- rust-analyzer-support_standalone_server_in_lib.patch 2022-11-21 20:45:50 UTC (rev 1351403) +++ rust-analyzer-support_standalone_server_in_lib.patch 2022-11-21 20:48:54 UTC (rev 1351404) @@ -1,64 +0,0 @@ -diff --git c/crates/rust-analyzer/src/cli/load_cargo.rs i/crates/rust-analyzer/src/cli/load_cargo.rs -index 5dba545b8..c9faeaa6b 100644 ---- c/crates/rust-analyzer/src/cli/load_cargo.rs -+++ i/crates/rust-analyzer/src/cli/load_cargo.rs -@@ -69,10 +69,13 @@ pub fn load_workspace( - 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![]; -+ for dir in ["libexec", "lib"] { -+ let server_path = sysroot.root().join(dir).join(&standalone_server_name); -+ if std::fs::metadata(&server_path).is_ok() { -+ path = server_path; -+ args = vec![]; -+ break; -+ } - } - } - } -diff --git c/crates/rust-analyzer/src/reload.rs i/crates/rust-analyzer/src/reload.rs -index aa0510a4e..d7cf69c3a 100644 ---- c/crates/rust-analyzer/src/reload.rs -+++ i/crates/rust-analyzer/src/reload.rs -@@ -327,21 +327,22 @@ impl GlobalState { - | ProjectWorkspace::Json { sysroot, .. } = ws - { - 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() -- ); -+ for dir in ["libexec", "lib"] { -+ let server_path = -+ sysroot.root().join(dir).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); -+ break; -+ } else { -+ tracing::debug!( -+ "Sysroot proc-macro server does not exist at {}", -+ server_path.display() -+ ); -+ } - } - } - }
