extra/rust to 1.69.0-3

extra/rust/PKGBUILD

@@ -21,11 +21,14 @@ pkgname=(
 )
 epoch=1
 pkgver=1.69.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Systems programming language focused on safety, speed and concurrency"
 url=https://www.rust-lang.org/
 arch=(x86_64)
-license=(MIT Apache)
+license=(
+  Apache
+  MIT
+)
 options=(
   !debug
   !emptydirs
@@ -67,8 +70,10 @@ b2sums=('1440ad3e7e52d1e31752c8a44f9e626b9c2b0388f7285ddbdf1d0f7802724e707daffe1
         '9752dc3b5fc2248c8bec4efbb3d927088d48d9416229d545a05180374549a0dda6e9d6d9a8d0a3b03437f2e3c54f9c153aab3281d46411f4c81559033b8fb04a'
         'a92b1eb9bc4101e055f89d9810c99e6e6472b3bb27bb01f8ea8a4b35f7e25512858e1555c2807eb7e8175df22c2e7937753d6787013920f9c76587e71f8df2f4'
         '9f3f911088a22101f8966dc16a1ecc65da5facaad5c169d9464e721aa452dd45968d359a5b35ae74ff23bd98d44c60cb04c0b8bc89e10fb99549c1670371c902')
-validpgpkeys=(108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
-              474E22316ABF4785A88C6E8EA2C794A986419D8A) # Tom Stellard <tstellar@redhat.com>
+validpgpkeys=(
+  108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+  474E22316ABF4785A88C6E8EA2C794A986419D8A  # Tom Stellard <tstellar@redhat.com>
+)
 
 prepare() {
   cd rustc-$pkgver-src
@@ -102,7 +107,7 @@ tools = [
   "clippy",
   "rustdoc",
   "rustfmt",
-  #"rust-analyzer",  # built separately
+  "rust-analyzer",
   "analysis",
   "src",
   "rust-demangler",
@@ -206,6 +211,9 @@ build() {
   rm usr/lib/rustlib/{components,install.log,rust-installer-version,uninstall.sh}
   rm usr/lib/rustlib/manifest-*
 
+  # built separately
+  rm usr/bin/rust-analyzer
+
   # rustbuild always installs copies of the shared libraries to /usr/lib,
   # overwrite them with symlinks to the per-architecture versions
   #mkdir -p usr/lib32