-ARMv7 workaround; +rust packaging guidelines

Details:
- Remove ARMv7h workaround because It's no longer neccessary (upstream Rust was patched)
+ Add check() function and --locked switch (to cargo command) to the PKGBUILD.
  This stems from following the Archlinux package guide for Rust packages. I don't think it's neccessary for -git packages to add the --locked option or to make them reproducible but it also won't harm.

3 files changed, 7 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca4771299f5a..9e729c2b1c79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs-git
 	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
-	pkgver = 1.11.0.r8.g0586c00
+	pkgver = 1.12.0.r5.g486c7d8
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -26,8 +26,6 @@ pkgbase = bitwarden_rs-git
 	sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74
 	sha512sums = 4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658
 	sha512sums = a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028
-	source_armv7h = 0002-Rollback-ARM-Toolchain.patch
-	sha512sums_armv7h = f26044402b04cc8494cf97b8592ad792bdda875f13598028f020757f8b79bce03059fabf11c80f78bec392f45ab713e861711026881b152df4fb2dcf675e8247
 
 pkgname = bitwarden_rs-git
 
diff --git a/0002-Rollback-ARM-Toolchain.patch b/0002-Rollback-ARM-Toolchain.patch
deleted file mode 100644
index bc65dd2518c2..000000000000
--- a/0002-Rollback-ARM-Toolchain.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/rust-toolchain b/rust-toolchain
-index 3f7cead..2ad2d88 100644
---- a/rust-toolchain
-+++ b/rust-toolchain
-@@ -1 +1 @@
--nightly-2019-08-27
-+nightly-2019-05-11
diff --git a/PKGBUILD b/PKGBUILD
index 1e8101c3de7c..8514afaeeb01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden_rs-git
 _pkgbase=bitwarden_rs
-pkgver=1.11.0.r8.g0586c00
+pkgver=1.12.0.r5.g486c7d8
 pkgrel=1
 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface."
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -19,12 +19,10 @@ source=('git+https://github.com/dani-garcia/bitwarden_rs.git'
 	"${_pkgbase}.install"
 	"${_pkgbase}.service"
 	"0001-Disable-Vault.patch")
-source_armv7h=("0002-Rollback-ARM-Toolchain.patch")
 sha512sums=('SKIP'
             '399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74'
             '4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658'
             'a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028')
-sha512sums_armv7h=('f26044402b04cc8494cf97b8592ad792bdda875f13598028f020757f8b79bce03059fabf11c80f78bec392f45ab713e861711026881b152df4fb2dcf675e8247')
 
 
 pkgver() {
@@ -39,14 +37,12 @@ build() {
 	#build bitwarden_rs
 	cd "$srcdir/$_pkgbase"
 	patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch"
+	cargo build --release --locked --features sqlite
+}
 
-	# Check if the build is on armv7h
-	if [ -e "$srcdir/0002-Rollback-ARM-Toolchain.patch" ] ;then
-		# workaround for armv7h bug: https://github.com/rust-lang/rust/issues/62896
-		echo "nightly-2019-05-11" > rust-toolchain
-	fi
-
-	cargo build --release --features sqlite
+check() {
+	cd "$srcdir/$_pkgbase"
+	cargo test --release --locked --features sqlite
 }
 
 package() {