lang/rust: Update to 1.37.0

- Force rebuild all consumers to catch regressions early

Thanks to Mikaël Urankar for providing updated bootstraps for
aarch64, armv6, armv7, powerpc64.

Changes:	https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
Tested by:	jbeich, tobik, greg@unrelenting.technology (aarch64)
With hat:	rust
Differential Revision:	https://reviews.freebsd.org/D21247

3 files changed, 51 insertions, 92 deletions

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index e8607e316757..649038d32a48 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	rust
-PORTVERSION?=	1.36.0
-PORTREVISION?=	1
+PORTVERSION?=	1.37.0
+PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
 		https://static.rust-lang.org/dist/:rust_bootstrap \
@@ -38,15 +38,15 @@ ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 CONFLICTS_INSTALL?=	rust-nightly
 
 # See WRKSRC/src/stage0.txt for this date and version values.
-BOOTSTRAPS_DATE?=		2019-05-23
+BOOTSTRAPS_DATE?=		2019-07-04
 BOOTSTRAPS_SUFFIX?=		${BOOTSTRAPS_SUFFIX_${ARCH}}
 BOOTSTRAPS_SUFFIX_powerpc64?=	-elfv1
 
-RUST_BOOTSTRAP_VERSION?=	1.35.0
+RUST_BOOTSTRAP_VERSION?=	1.36.0
 RUSTC_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
 RUST_STD_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}
 
-CARGO_BOOTSTRAP_VERSION?=	0.36.0
+CARGO_BOOTSTRAP_VERSION?=	0.37.0
 CARGO_BOOTSTRAP=		${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}
 
 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
@@ -245,7 +245,7 @@ makesum:
 	${GREP} ${RUST_ARCH_${arch}} ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}
 	${RM} ${DISTINFO_FILE}.${arch}
 .endfor
-	${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=powerpc64 BOOTSTRAPS_SUFFIX="" DISTINFO_FILE=${DISTINFO_FILE}.powerpc64-elfv2
+	${MAKE} -D_RUST_MAKESUM_GUARD makesum ARCH=powerpc64 BOOTSTRAPS_SUFFIX="-elfv2" DISTINFO_FILE=${DISTINFO_FILE}.powerpc64-elfv2
 	${GREP} ${RUST_ARCH_powerpc64} ${DISTINFO_FILE}.powerpc64-elfv2 >> ${DISTINFO_FILE}
 	${RM} ${DISTINFO_FILE}.powerpc64-elfv2
 .endif
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index c8b0fbf4abf0..c8013b08b8ed 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,45 +1,45 @@
-TIMESTAMP = 1562165864
-SHA256 (rust/rustc-1.36.0-src.tar.xz) = f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55b57900f8f2d
-SIZE (rust/rustc-1.36.0-src.tar.xz) = 98707920
-SHA256 (rust/2019-05-23/rustc-1.35.0-aarch64-unknown-freebsd.tar.gz) = 63d0d9379add87f213bac39879a4ce57f7d275ce96c3e34c161569a742cb0537
-SIZE (rust/2019-05-23/rustc-1.35.0-aarch64-unknown-freebsd.tar.gz) = 62676068
-SHA256 (rust/2019-05-23/rust-std-1.35.0-aarch64-unknown-freebsd.tar.gz) = 7b8a79809808316b041bc6965d9f895b9bfb65f4b1d8a2388032d07f58878902
-SIZE (rust/2019-05-23/rust-std-1.35.0-aarch64-unknown-freebsd.tar.gz) = 72334172
-SHA256 (rust/2019-05-23/cargo-0.36.0-aarch64-unknown-freebsd.tar.gz) = 76dab07624cb2c1b4dbff8099fb272d4068737c1b85afea73b5411c0b78f6821
-SIZE (rust/2019-05-23/cargo-0.36.0-aarch64-unknown-freebsd.tar.gz) = 5612518
-SHA256 (rust/2019-05-23/rustc-1.35.0-x86_64-unknown-freebsd.tar.gz) = d3b5a6cfa41264e1873287bdb89892a7edc40333d581f468890c68336f50a601
-SIZE (rust/2019-05-23/rustc-1.35.0-x86_64-unknown-freebsd.tar.gz) = 73812596
-SHA256 (rust/2019-05-23/rust-std-1.35.0-x86_64-unknown-freebsd.tar.gz) = 22e8a2deb83dac920237f810b612b7ea555b03f5830f413a94d007ec683de519
-SIZE (rust/2019-05-23/rust-std-1.35.0-x86_64-unknown-freebsd.tar.gz) = 83588135
-SHA256 (rust/2019-05-23/cargo-0.36.0-x86_64-unknown-freebsd.tar.gz) = 3141668f12fd6d22f586ee56ff07977a6e969ffda6a51245f35865ca61714a5a
-SIZE (rust/2019-05-23/cargo-0.36.0-x86_64-unknown-freebsd.tar.gz) = 6235107
-SHA256 (rust/2019-05-23/rustc-1.35.0-armv6-unknown-freebsd.tar.gz) = acb806b136f699907b007a9376aee5a20a8173d7bd65fee86ae12ef2674ae949
-SIZE (rust/2019-05-23/rustc-1.35.0-armv6-unknown-freebsd.tar.gz) = 65093278
-SHA256 (rust/2019-05-23/rust-std-1.35.0-armv6-unknown-freebsd.tar.gz) = 1ef63070a159f248b17c710b0f181c62ba8077cb12a9053b67c9f1e9351d88d5
-SIZE (rust/2019-05-23/rust-std-1.35.0-armv6-unknown-freebsd.tar.gz) = 74080468
-SHA256 (rust/2019-05-23/cargo-0.36.0-armv6-unknown-freebsd.tar.gz) = fcbdcde51889513a1318f39d1bf1a40e9496ebac2aa59585c1b6e5eb7b30bffe
-SIZE (rust/2019-05-23/cargo-0.36.0-armv6-unknown-freebsd.tar.gz) = 5778162
-SHA256 (rust/2019-05-23/rustc-1.35.0-armv7-unknown-freebsd.tar.gz) = ee46c02cba64d377ef24767656d479494371ebc4adb8d215af84e82453695c83
-SIZE (rust/2019-05-23/rustc-1.35.0-armv7-unknown-freebsd.tar.gz) = 63961767
-SHA256 (rust/2019-05-23/rust-std-1.35.0-armv7-unknown-freebsd.tar.gz) = 1a6a06b85d07c3bb459b4c1469a05906cb4eb34d9b12a64799d1962cbd605089
-SIZE (rust/2019-05-23/rust-std-1.35.0-armv7-unknown-freebsd.tar.gz) = 73213309
-SHA256 (rust/2019-05-23/cargo-0.36.0-armv7-unknown-freebsd.tar.gz) = ebb477032fc8a4da4fddb7e9825b1b6b8560442a77cbaef79762fcae6c11345c
-SIZE (rust/2019-05-23/cargo-0.36.0-armv7-unknown-freebsd.tar.gz) = 4826717
-SHA256 (rust/2019-05-23/rustc-1.35.0-i686-unknown-freebsd.tar.gz) = 1f09cc3681e524edb1caa1ce42c979a3378825fe61dc12fbfd9461b8170cd1e5
-SIZE (rust/2019-05-23/rustc-1.35.0-i686-unknown-freebsd.tar.gz) = 74347029
-SHA256 (rust/2019-05-23/rust-std-1.35.0-i686-unknown-freebsd.tar.gz) = ae1880575667276e7e23512febec4306cd02f48cce2b1d9dc28996ef3046f2a7
-SIZE (rust/2019-05-23/rust-std-1.35.0-i686-unknown-freebsd.tar.gz) = 83887741
-SHA256 (rust/2019-05-23/cargo-0.36.0-i686-unknown-freebsd.tar.gz) = 789f5d47b485d3ac8f48bcc00e43542d0754ea4db94c727e82882d069fcc7714
-SIZE (rust/2019-05-23/cargo-0.36.0-i686-unknown-freebsd.tar.gz) = 6006371
-SHA256 (rust/2019-05-23/rustc-1.35.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 187e428b630686131b5d6f97196b8bb21b157a7466edbaea5daecd8d3f20fc2f
-SIZE (rust/2019-05-23/rustc-1.35.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 72964859
-SHA256 (rust/2019-05-23/rust-std-1.35.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = fa09e61c617a190dc34435960f158b4a5f885b6813ec18925bf6cccddc988aed
-SIZE (rust/2019-05-23/rust-std-1.35.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 76437453
-SHA256 (rust/2019-05-23/cargo-0.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = add68dcac5d70c2a3eecd6ca25a46694f8c5087f776b47cb836d503971bdfff0
-SIZE (rust/2019-05-23/cargo-0.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 6801421
-SHA256 (rust/2019-05-23/rustc-1.35.0-powerpc64-unknown-freebsd.tar.gz) = b1d77fb113d05261926b6079cb1b608ca9c7dfaba65f85393b0b2197ea24ef11
-SIZE (rust/2019-05-23/rustc-1.35.0-powerpc64-unknown-freebsd.tar.gz) = 65711766
-SHA256 (rust/2019-05-23/rust-std-1.35.0-powerpc64-unknown-freebsd.tar.gz) = 288185410673cc4dc950b1f5e3cf9fb865768b585bbbe9d77f8210714f7e895c
-SIZE (rust/2019-05-23/rust-std-1.35.0-powerpc64-unknown-freebsd.tar.gz) = 74365732
-SHA256 (rust/2019-05-23/cargo-0.36.0-powerpc64-unknown-freebsd.tar.gz) = 050834c4b49fa25b087fd69c8e37bfc8d2d919716317bbf4348ec9099b5d8c04
-SIZE (rust/2019-05-23/cargo-0.36.0-powerpc64-unknown-freebsd.tar.gz) = 5155807
+TIMESTAMP = 1565879155
+SHA256 (rust/rustc-1.37.0-src.tar.xz) = 10abffac50a729cf74cef6dd03193a2f4647541bd19ee9281be9e5b12ca8cdfd
+SIZE (rust/rustc-1.37.0-src.tar.xz) = 98654252
+SHA256 (rust/2019-07-04/rustc-1.36.0-aarch64-unknown-freebsd.tar.gz) = 8eec2d7750c96030b6b95eec2bc9ed1b7194780628d6017f615c2effdcc3b928
+SIZE (rust/2019-07-04/rustc-1.36.0-aarch64-unknown-freebsd.tar.gz) = 68458486
+SHA256 (rust/2019-07-04/rust-std-1.36.0-aarch64-unknown-freebsd.tar.gz) = 3c1e46be0c1d42bec5538eccc07e948d65743a160417856bf6d5885cede31c98
+SIZE (rust/2019-07-04/rust-std-1.36.0-aarch64-unknown-freebsd.tar.gz) = 77059731
+SHA256 (rust/2019-07-04/cargo-0.37.0-aarch64-unknown-freebsd.tar.gz) = 2fb56bb2a1420ea66e6f75f37d1c0d808c2943401d70650696d463ad90e78af9
+SIZE (rust/2019-07-04/cargo-0.37.0-aarch64-unknown-freebsd.tar.gz) = 6144087
+SHA256 (rust/2019-07-04/rustc-1.36.0-x86_64-unknown-freebsd.tar.gz) = c2dd0cec49b054ed9439762fb31555b8df9a3d81747b194f7d3afbc6d8adb8de
+SIZE (rust/2019-07-04/rustc-1.36.0-x86_64-unknown-freebsd.tar.gz) = 79088915
+SHA256 (rust/2019-07-04/rust-std-1.36.0-x86_64-unknown-freebsd.tar.gz) = a2a923cbfa3481af66c22673cac38e7cb70e26333318ad59c27b8b6ac16a84fe
+SIZE (rust/2019-07-04/rust-std-1.36.0-x86_64-unknown-freebsd.tar.gz) = 87112148
+SHA256 (rust/2019-07-04/cargo-0.37.0-x86_64-unknown-freebsd.tar.gz) = ae237412a5de0d01cc8aa065e00f604e72fadf85dd350d16b73a15d6ff7393f2
+SIZE (rust/2019-07-04/cargo-0.37.0-x86_64-unknown-freebsd.tar.gz) = 6651104
+SHA256 (rust/2019-07-04/rustc-1.36.0-armv6-unknown-freebsd.tar.gz) = 30af064165ada8defaa8bd1e63265944fb37c69172249723bd2747203ad7cbf0
+SIZE (rust/2019-07-04/rustc-1.36.0-armv6-unknown-freebsd.tar.gz) = 71286638
+SHA256 (rust/2019-07-04/rust-std-1.36.0-armv6-unknown-freebsd.tar.gz) = 6c35036131a110c858e7cb83657cd1b25ffae4cc65708f4e5a6e31325ef96edd
+SIZE (rust/2019-07-04/rust-std-1.36.0-armv6-unknown-freebsd.tar.gz) = 79061925
+SHA256 (rust/2019-07-04/cargo-0.37.0-armv6-unknown-freebsd.tar.gz) = e4fa3e76ab448eb8bfdf323b4de976a6f07c35d0eca91cc2bf480b41faa157ec
+SIZE (rust/2019-07-04/cargo-0.37.0-armv6-unknown-freebsd.tar.gz) = 5544892
+SHA256 (rust/2019-07-04/rustc-1.36.0-armv7-unknown-freebsd.tar.gz) = c652bfb82d0e640e24a91aef39e9eeeedc0bd0b5b828546f9ef47bbae6a279bd
+SIZE (rust/2019-07-04/rustc-1.36.0-armv7-unknown-freebsd.tar.gz) = 70165782
+SHA256 (rust/2019-07-04/rust-std-1.36.0-armv7-unknown-freebsd.tar.gz) = 8750ff6013261b68f692413c7db97fabac6a83583b4c16c2175ebb6a81c1d0c6
+SIZE (rust/2019-07-04/rust-std-1.36.0-armv7-unknown-freebsd.tar.gz) = 78322763
+SHA256 (rust/2019-07-04/cargo-0.37.0-armv7-unknown-freebsd.tar.gz) = f092d15bbfe91423efffa2d20c77e5ca9655aac4c41bd1943cf632aff1a92bf1
+SIZE (rust/2019-07-04/cargo-0.37.0-armv7-unknown-freebsd.tar.gz) = 5463628
+SHA256 (rust/2019-07-04/rustc-1.36.0-i686-unknown-freebsd.tar.gz) = 4ac319c56b360a1c9418cc1862ed86366c79155dbcfdd0a9852b98e0bc4dcd0e
+SIZE (rust/2019-07-04/rustc-1.36.0-i686-unknown-freebsd.tar.gz) = 80314139
+SHA256 (rust/2019-07-04/rust-std-1.36.0-i686-unknown-freebsd.tar.gz) = 3387dff03da9babc28861892f41b08ff58bc51bea2d0e84ac0a045e84999eebf
+SIZE (rust/2019-07-04/rust-std-1.36.0-i686-unknown-freebsd.tar.gz) = 87744414
+SHA256 (rust/2019-07-04/cargo-0.37.0-i686-unknown-freebsd.tar.gz) = 3c4cef06939123951649c9ffcef7ba104cc3bc63c2b3243a7a7228749c58f37c
+SIZE (rust/2019-07-04/cargo-0.37.0-i686-unknown-freebsd.tar.gz) = 6553782
+SHA256 (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 98b0f27977a5412852044bc7ef2e95dfb5eced140c73a0ed0faf5841cecbaf83
+SIZE (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 78638311
+SHA256 (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 197bb8ce6944eddc7c18d20f7c2721e35abb3458678ef60d287941ca01e244ed
+SIZE (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 81520259
+SHA256 (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 17d9345621caa47015843b811019e16b32020c053fb72c3f3a6909e42d548f6c
+SIZE (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv1.tar.gz) = 7388067
+SHA256 (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 7581410a224e3649fc75cbb302c46fa0d59d571f3c6b9556682ab1411872db83
+SIZE (rust/2019-07-04/rustc-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 72163495
+SHA256 (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = edd4584a9583fb699dbf23797151d1d78bdf1e1d1389d715acbdefc5fcf5dc7c
+SIZE (rust/2019-07-04/rust-std-1.36.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 79921640
+SHA256 (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 408fb3a5b2127ca369d5e5fe5768d475820916aa4e84150bdb939d0d155d5e32
+SIZE (rust/2019-07-04/cargo-0.37.0-powerpc64-unknown-freebsd-elfv2.tar.gz) = 5701853
diff --git a/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs b/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
deleted file mode 100644
index 5bb3024426e6..000000000000
--- a/lang/rust/files/patch-vendor_backtrace_src_backtrace_libunwind.rs
+++ /dev/null
@@ -1,41 +0,0 @@
---- vendor/backtrace/src/backtrace/libunwind.rs.orig	2019-04-08 14:18:22 UTC
-+++ vendor/backtrace/src/backtrace/libunwind.rs
-@@ -113,12 +113,14 @@ mod uw {
- 
-         // available since GCC 4.2.0, should be fine for our purpose
-         #[cfg(all(not(all(target_os = "android", target_arch = "arm")),
-+                  not(all(target_os = "freebsd", target_arch = "arm")),
-                   not(all(target_os = "linux", target_arch = "arm"))))]
-         pub fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context,
-                                  ip_before_insn: *mut c_int)
-                     -> libc::uintptr_t;
- 
-         #[cfg(all(not(target_os = "android"),
-+                  not(all(target_os = "freebsd", target_arch = "arm")),
-                   not(all(target_os = "linux", target_arch = "arm"))))]
-         pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void)
-             -> *mut c_void;
-@@ -128,6 +130,7 @@ mod uw {
-     // expansion of the macro. This is all copy/pasted directly from the
-     // header file with the definition of _Unwind_GetIP.
-     #[cfg(any(all(target_os = "android", target_arch = "arm"),
-+              all(target_os = "freebsd", target_arch = "arm"),
-               all(target_os = "linux", target_arch = "arm")))]
-     pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t {
-         #[repr(C)]
-@@ -175,6 +178,7 @@ mod uw {
-     // This function doesn't exist on Android or ARM/Linux, so make it same
-     // to _Unwind_GetIP
-     #[cfg(any(all(target_os = "android", target_arch = "arm"),
-+              all(target_os = "freebsd", target_arch = "arm"),
-               all(target_os = "linux", target_arch = "arm")))]
-     pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context,
-                                     ip_before_insn: *mut c_int)
-@@ -187,6 +191,7 @@ mod uw {
-     // This function also doesn't exist on Android or ARM/Linux, so make it
-     // a no-op
-     #[cfg(any(target_os = "android",
-+              all(target_os = "freebsd", target_arch = "arm"),
-               all(target_os = "linux", target_arch = "arm")))]
-     pub unsafe fn _Unwind_FindEnclosingFunction(pc: *mut c_void)
-         -> *mut c_void