Date: Monday, November 21, 2022 @ 20:49:17
Author: polyzen
Revision: 1351405
archrelease: copy trunk to community-x86_64
Added:
rust-analyzer/repos/community-x86_64/PKGBUILD
(from rev 1351404, rust-analyzer/trunk/PKGBUILD)
Deleted:
rust-analyzer/repos/community-x86_64/PKGBUILD
rust-analyzer/repos/community-x86_64/rust-analyzer-support_standalone_server_in_lib.patch
------------------------------------------------------+
PKGBUILD | 66 +++++++----------
rust-analyzer-support_standalone_server_in_lib.patch | 64 ----------------
2 files changed, 31 insertions(+), 99 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-21 20:48:54 UTC (rev 1351404)
+++ PKGBUILD 2022-11-21 20:49:17 UTC (rev 1351405)
@@ -1,35 +0,0 @@
-# Maintainer: Daniel M. Capella <[email protected]>
-# Contributor: Sergey A. <[email protected]>
-
-pkgname=rust-analyzer
-_pkgver=2022-11-14
-pkgver=${_pkgver//-}
-pkgrel=3
-pkgdesc='Rust compiler front-end for IDEs'
-arch=('x86_64')
-url=https://rust-analyzer.github.io/
-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')
-
-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() {
- cd $pkgname
- CFG_RELEASE=1 cargo build --release --locked --offline
-}
-
-package() {
- cd $pkgname
- install -Dt "$pkgdir"/usr/bin target/release/$pkgname{,-proc-macro-srv}
- install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE-MIT
-}
Copied: rust-analyzer/repos/community-x86_64/PKGBUILD (from rev 1351404,
rust-analyzer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-21 20:49:17 UTC (rev 1351405)
@@ -0,0 +1,31 @@
+# Maintainer: Daniel M. Capella <[email protected]>
+# Contributor: Sergey A. <[email protected]>
+
+pkgname=rust-analyzer
+_pkgver=2022-11-21
+pkgver=${_pkgver//-}
+pkgrel=1
+pkgdesc='Rust compiler front-end for IDEs'
+arch=('x86_64')
+url=https://rust-analyzer.github.io/
+license=('Apache' 'MIT')
+depends=('gcc-libs' 'rust-src')
+makedepends=('git')
+source=("git+https://github.com/rust-lang/$pkgname.git#tag=$_pkgver";)
+b2sums=('SKIP')
+
+prepare() {
+ cd $pkgname
+ cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
+build() {
+ cd $pkgname
+ CFG_RELEASE=1 cargo build --release --locked --offline
+}
+
+package() {
+ cd $pkgname
+ install -Dt "$pkgdir"/usr/bin target/release/$pkgname{,-proc-macro-srv}
+ install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE-MIT
+}
Deleted: rust-analyzer-support_standalone_server_in_lib.patch
===================================================================
--- rust-analyzer-support_standalone_server_in_lib.patch 2022-11-21
20:48:54 UTC (rev 1351404)
+++ rust-analyzer-support_standalone_server_in_lib.patch 2022-11-21
20:49:17 UTC (rev 1351405)
@@ -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()
-+ );
-+ }
- }
- }
- }
