diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 8235e9e53f42..dd50471e09b8 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2019/04/08 14:18:39 gdt Exp $
+# $NetBSD: Makefile,v 1.94 2019/04/14 12:42:03 he Exp $
 
-DISTNAME=	rustc-1.33.0-src
+DISTNAME=	rustc-1.34.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	http://static.rust-lang.org/dist/
@@ -144,10 +144,10 @@ BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
 # own bootstrap.  See the stage0-bootstrap below for more details.
 #
 DISTFILES:=		${DEFAULT_DISTFILES}
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 #
 .if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		i686-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -155,7 +155,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		x86_64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -163,7 +163,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		i686-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -171,7 +171,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		x86_64-unknown-linux-gnu
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -179,7 +179,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		x86_64-sun-solaris
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 SITES.${RUST_STAGE0}=	https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -188,7 +188,7 @@ RUST_BOOTSTRAP_PATH?=	${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		i686-unknown-freebsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -196,7 +196,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH:=		x86_64-unknown-freebsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -221,7 +221,7 @@ pre-build-fix:
 	${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.32.0
+RUST_STAGE0_VER=	1.33.0
 RUST_ARCH=		x86_64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 1f1ab8076943..c41ded6b6e30 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,37 +1,5 @@
-$NetBSD: distinfo,v 1.69 2019/03/27 15:09:36 he Exp $
+$NetBSD: distinfo,v 1.70 2019/04/14 12:42:03 he Exp $
 
-SHA1 (rust-1.32.0-i686-apple-darwin.tar.gz) = 53b4b0c4a05a4fb3fa5f601151df166dd488f911
-RMD160 (rust-1.32.0-i686-apple-darwin.tar.gz) = 91949e77519a8a1b0330d69faf06817a6d8ba856
-SHA512 (rust-1.32.0-i686-apple-darwin.tar.gz) = d29c1f9b4506352273644ae401f47a0b91dde1af72a4f0c422d9ced96663fccf830954eaddd9910425b354e76441e8dbfd4bb7561c240985fdbbd24524951ada
-Size (rust-1.32.0-i686-apple-darwin.tar.gz) = 212695328 bytes
-SHA1 (rust-1.32.0-i686-unknown-freebsd.tar.gz) = 501e6c348a70a9db07ee9d4dfa21c5704935e680
-RMD160 (rust-1.32.0-i686-unknown-freebsd.tar.gz) = 2f6d312ba1ae260f3ec12c7bae32d6c544b85bf5
-SHA512 (rust-1.32.0-i686-unknown-freebsd.tar.gz) = f9113c71711b9e083de80d500fd9e4482071c922c9aac5871fe8e2e771fedb9a4e0fb75216eb4f54a356d43955cf8f6c0adbaac833b28939b66b0542be713a04
-Size (rust-1.32.0-i686-unknown-freebsd.tar.gz) = 170754633 bytes
-SHA1 (rust-1.32.0-i686-unknown-linux-gnu.tar.gz) = ebc25d35f9797c031e0156b6b576b3323d34a6fb
-RMD160 (rust-1.32.0-i686-unknown-linux-gnu.tar.gz) = cdd81e4f8773a0854c25e1ec142d27cc0658e8c5
-SHA512 (rust-1.32.0-i686-unknown-linux-gnu.tar.gz) = d3bbfeec83a6bd58011e7e8facc805e7b6d0dd5d81cd457afa372852a3a895847dc095b16ba7a011526813c33e84e7c68e73c143a970f7072bc67c26a83c6fb0
-Size (rust-1.32.0-i686-unknown-linux-gnu.tar.gz) = 239403108 bytes
-SHA1 (rust-1.32.0-x86_64-apple-darwin.tar.gz) = 7df72b1248d7de97713c13379eb656fae3d14bec
-RMD160 (rust-1.32.0-x86_64-apple-darwin.tar.gz) = f53ae7b47835010081069da4989ac3c01ac23798
-SHA512 (rust-1.32.0-x86_64-apple-darwin.tar.gz) = 4847b2b5edcd38772750b00c7aec7a5c2cab0d54a5085c7f1e60b96b9800dbcf5aaf2c7a02e9f5579acc757535dc5b1358f8d7c025b8cbec9a4faf958189569c
-Size (rust-1.32.0-x86_64-apple-darwin.tar.gz) = 217590063 bytes
-SHA1 (rust-1.32.0-x86_64-sun-solaris.tar.gz) = c8a36f72d8e689410d54d7bd63c2c335f563c917
-RMD160 (rust-1.32.0-x86_64-sun-solaris.tar.gz) = 56019be0127fc1a8a3ef7d60c7db9faf6f8f0e3c
-SHA512 (rust-1.32.0-x86_64-sun-solaris.tar.gz) = c233c5d61b3d5a6bc395ab1a478af663a42969c81f757374808c041f4141ffd75e06224dbc1efd1e71860a96e430204ac669c3140f70a9a06b252c6fe1a82047
-Size (rust-1.32.0-x86_64-sun-solaris.tar.gz) = 200070309 bytes
-SHA1 (rust-1.32.0-x86_64-unknown-freebsd.tar.gz) = 989458118d774283fe58e5bbfbf118492d388cea
-RMD160 (rust-1.32.0-x86_64-unknown-freebsd.tar.gz) = c473bb82244d21839b9b54608a0acbec50c34994
-SHA512 (rust-1.32.0-x86_64-unknown-freebsd.tar.gz) = 2026d290253f2ba29975b237c06c96e6c25f4a7ee39e6160b517063a6323410bd5ce89162074ec4027549ce4e7983bc784ebad8a233def04aaf828885b83a9be
-Size (rust-1.32.0-x86_64-unknown-freebsd.tar.gz) = 172728598 bytes
-SHA1 (rust-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 4d8ab00402dd9526cda1a4c395786297a9ea4ad3
-RMD160 (rust-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 581d43586e35c8923e052e838043ea1aa77b5060
-SHA512 (rust-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 9f3ccf043946de6ffae3973d88f893c0021166e4037b011a677e8090c76189a28ee022ab40cc41f2d2f9aa389cda45d2743c5fa1f567ec0f8823dcd73ead5166
-Size (rust-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 241937484 bytes
-SHA1 (rust-1.32.0-x86_64-unknown-netbsd.tar.gz) = f71178f3c412c2e27684ef722b4f5cf760694b71
-RMD160 (rust-1.32.0-x86_64-unknown-netbsd.tar.gz) = 5dc0d80194dcb6c82f8e0be1bd623b8b2e1a6a9f
-SHA512 (rust-1.32.0-x86_64-unknown-netbsd.tar.gz) = 2a72c8feb23572c8a41071b409661d018fb6a08a54520304805bd43f96ebda2de778791a229633f0156124231b3208ba04d0f544bb4757673f6c72d2ed8d4e9c
-Size (rust-1.32.0-x86_64-unknown-netbsd.tar.gz) = 174448988 bytes
 SHA1 (rust-1.33.0-aarch64-unknown-netbsd.tar.gz) = ae466383332e134fe6a449ec4d9b76b2ba0141f4
 RMD160 (rust-1.33.0-aarch64-unknown-netbsd.tar.gz) = 4c2c09986363814e30dfd911767b57f3c7ebbee6
 SHA512 (rust-1.33.0-aarch64-unknown-netbsd.tar.gz) = 3d10a398c6170e94853ce314b258b098380a663d82ace27aec5d7bda4dbd7ca548f8544a1025c9dcd37535fb73ef42c14ffeee0983c3802b4d53c215242080f2
@@ -40,6 +8,18 @@ SHA1 (rust-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = ddbe43f0981a9fa34237c68a
 RMD160 (rust-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = 1780fa837c7d180b0982560a959c6b057323ff51
 SHA512 (rust-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = 4171b53c0f4cc8181597dc1816597d09f32e3cab332dccd5f74590b7c15c12ad6565815e895535064ca1ab57a11744a6f3efa7f2e77bdad8128555fa0b915ccf
 Size (rust-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = 228128517 bytes
+SHA1 (rust-1.33.0-i686-apple-darwin.tar.gz) = 3747f4e11ef6d3229bfd41dbdd9990897f9dea83
+RMD160 (rust-1.33.0-i686-apple-darwin.tar.gz) = 32d72b91d159a98470bbfaff4e1087f8b15eb3b9
+SHA512 (rust-1.33.0-i686-apple-darwin.tar.gz) = 2f185ed2be551eb0a084f1d36a0753651657df16a929c4250ef0d61b94719876da22892c235ad7b8b5c714ce2bf5c10162b4ec85357ea8ffb1ef0b66b0d9dee0
+Size (rust-1.33.0-i686-apple-darwin.tar.gz) = 241195453 bytes
+SHA1 (rust-1.33.0-i686-unknown-freebsd.tar.gz) = 617068d743b39a04961184d2584d4f47d25a53f0
+RMD160 (rust-1.33.0-i686-unknown-freebsd.tar.gz) = aa4997740247687b1257fdd36170ac0523d05acd
+SHA512 (rust-1.33.0-i686-unknown-freebsd.tar.gz) = 201584770d0209a8416f1090bc3c9222bae4171633d4165e99816bd76c2fc0b72f096d38ddb51075b94c6af2b973e79d2e54cd531cf886f65ef2b8cb1a58d697
+Size (rust-1.33.0-i686-unknown-freebsd.tar.gz) = 181177768 bytes
+SHA1 (rust-1.33.0-i686-unknown-linux-gnu.tar.gz) = ed9ccbc87ac02f1e4ec7a51e6179dbd7379da930
+RMD160 (rust-1.33.0-i686-unknown-linux-gnu.tar.gz) = 32d97519f1c9e505fbbc3755603fc905629a8516
+SHA512 (rust-1.33.0-i686-unknown-linux-gnu.tar.gz) = 1758eec6594e1051b6cc532f9b41bc71fdb4fe36ad641e32054ddeae16d1811c3ccd3211c9c23fb71af296e09d5c602a9af5ad10feccdde69b7294a8e78ac562
+Size (rust-1.33.0-i686-unknown-linux-gnu.tar.gz) = 272770259 bytes
 SHA1 (rust-1.33.0-i686-unknown-netbsd.tar.gz) = 3eb8199d4522983868c6fe9b9fb1cfaab313914c
 RMD160 (rust-1.33.0-i686-unknown-netbsd.tar.gz) = b1524d37f0597c742c311ad3e6e759830c84e3b5
 SHA512 (rust-1.33.0-i686-unknown-netbsd.tar.gz) = a26727e787a74c70a513c5725ac01b74f8f3f5fa695fa6d58a6352a11a3aaef95690f8441e2dc547881069d058226a2f735a5f45c0bc41a3aee458267f2a3c23
@@ -52,34 +32,26 @@ SHA1 (rust-1.33.0-sparc64-unknown-netbsd.tar.gz) = eab66458cf1ab3a8257c8f76b6f19
 RMD160 (rust-1.33.0-sparc64-unknown-netbsd.tar.gz) = 276c19dc4f31ceebaa0fde27bccd91972afc7762
 SHA512 (rust-1.33.0-sparc64-unknown-netbsd.tar.gz) = 3044958daabcc7038c3a71dda288e00b5b35d63067ceb5a4b5d8cf1be3ec972eecdd793447968ee9f9bf5c90e29e9277e6f3671311b20a790f7f927fb0e1cfac
 Size (rust-1.33.0-sparc64-unknown-netbsd.tar.gz) = 228905195 bytes
-SHA1 (rust-std-1.32.0-i686-apple-darwin.tar.gz) = 8017b6b1d228efc8551de29bd4b872f55746147b
-RMD160 (rust-std-1.32.0-i686-apple-darwin.tar.gz) = 3a40018a2d94751102d83d53112a4490f25a41c0
-SHA512 (rust-std-1.32.0-i686-apple-darwin.tar.gz) = 6f761c91b3deb78ccdec9dce170509778d4351d8604190beee47b9960b22ed02083acf85024aa967a29797d8de1d70493fd464599639acf5982acafa9ccc98f3
-Size (rust-std-1.32.0-i686-apple-darwin.tar.gz) = 61991141 bytes
-SHA1 (rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = ddbb278baf9d6469bfb39b038a0d95a928d378a2
-RMD160 (rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 9261f7bc3f2624cdb70321b034b643798dc3e24e
-SHA512 (rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 8708c78d2cd54565ac5cd9ac272f06f55bd28dc1cc66398c0b907db5e68a201527dd2c25c452a1f6cfd329496c78faeecb0f728e35102c2a0b0e1f950e66e537
-Size (rust-std-1.32.0-i686-unknown-freebsd.tar.gz) = 67402728 bytes
-SHA1 (rust-std-1.32.0-i686-unknown-linux-gnu.tar.gz) = f5ca6e7be7cf3ccf67263c7aeeee30c1633c694e
-RMD160 (rust-std-1.32.0-i686-unknown-linux-gnu.tar.gz) = e58a6d82a5c5291a18134705057a095f1b162e39
-SHA512 (rust-std-1.32.0-i686-unknown-linux-gnu.tar.gz) = a5499a451aa6acf2dd4c54c37cff672c62a9de957d42473826ef191b33f96e475ae7a206960a97dc27ab0237dd617bbdb0c29d96de5f89929cfcffcb61e7f9b3
-Size (rust-std-1.32.0-i686-unknown-linux-gnu.tar.gz) = 70350313 bytes
-SHA1 (rust-std-1.32.0-x86_64-apple-darwin.tar.gz) = f1b4c2ea586b857d71db11e7143e11760fc45e32
-RMD160 (rust-std-1.32.0-x86_64-apple-darwin.tar.gz) = 9f8ed0fbc2f59cefc00148a29b856dbee2fd78b1
-SHA512 (rust-std-1.32.0-x86_64-apple-darwin.tar.gz) = f8760aa93374a843cf56e834c36673abfcfeb238d48a8c66f2fb8754660755aba24d0b747fa8b7734968f2592ac3cdc51e2d01d645638f972b89fec9d7f49750
-Size (rust-std-1.32.0-x86_64-apple-darwin.tar.gz) = 63290484 bytes
-SHA1 (rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 7516719b0ae43ee8c43f24bbfbadc4c3a6524481
-RMD160 (rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 2952056b57de6052e4cd27e565216e442252d339
-SHA512 (rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 59d206956340c8a516ae973fdd2494596ab17f8fb1ff1f96a841d149e59894011c6cd3295e173a1a3ed21865a182aa7eaeef25f013638ffa5c4bf0b8909fc2c7
-Size (rust-std-1.32.0-x86_64-unknown-freebsd.tar.gz) = 67069445 bytes
-SHA1 (rust-std-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = d2e824fd5ee5b20fd05c4f162c7bbe3d45f63d76
-RMD160 (rust-std-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 539a0c94240b26002ac4b85dfaca539d59eab066
-SHA512 (rust-std-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 2db02be07b013e1450555c5b05162ef65edd538eea7268784cd54e0f2562525ee8c8b3b221ea6f1d31da5a2d9cf774fda8ff7b5f64ab642e261878a942c17193
-Size (rust-std-1.32.0-x86_64-unknown-linux-gnu.tar.gz) = 72089617 bytes
-SHA1 (rust-std-1.32.0-x86_64-unknown-netbsd.tar.gz) = a5a13c199eae3e3d8b2eece5470add5ee8dba82b
-RMD160 (rust-std-1.32.0-x86_64-unknown-netbsd.tar.gz) = d5b9eb020e0a855822d48b9e799dd275e9dcf4a6
-SHA512 (rust-std-1.32.0-x86_64-unknown-netbsd.tar.gz) = 3045e459887b8f7bb5f452a9364969f78f14371de25c81926e60525c5618a133d5b9821ffe0f62982bb6f589def9d3e6ce4941b93617bcf0c1d14cf1a87ca9ea
-Size (rust-std-1.32.0-x86_64-unknown-netbsd.tar.gz) = 66975759 bytes
+SHA1 (rust-1.33.0-x86_64-apple-darwin.tar.gz) = a1ca5de2eb62f346437d70a2eafc4d49e15decbb
+RMD160 (rust-1.33.0-x86_64-apple-darwin.tar.gz) = 389aa9da93a874c9bdac5e931bfcc0d76bac5660
+SHA512 (rust-1.33.0-x86_64-apple-darwin.tar.gz) = a7b669ca7563e5e4e9a74fc2ca1ace150c8f62e53cc687b58570e97f7850d66970308ed4d84304fbc30f94cc9d615bafad49657ff94307fb198880e715a87d39
+Size (rust-1.33.0-x86_64-apple-darwin.tar.gz) = 245799023 bytes
+SHA1 (rust-1.33.0-x86_64-sun-solaris.tar.gz) = dc455032fdcf8057473f2d736e17739be5524257
+RMD160 (rust-1.33.0-x86_64-sun-solaris.tar.gz) = a8de825ed0e77c290d93009d45a0a5425bd32c48
+SHA512 (rust-1.33.0-x86_64-sun-solaris.tar.gz) = d3be6347f4714a82f1d4fe70eb40e5dc5f1ec8620becca24179a608c33f6fde37f4afd8514e080b5459767df67d6ee836c537a1617bbc2bea3d6fc51a7dfd538
+Size (rust-1.33.0-x86_64-sun-solaris.tar.gz) = 215768353 bytes
+SHA1 (rust-1.33.0-x86_64-unknown-freebsd.tar.gz) = 6cba12148bebd2dbd08daab5e49490eefb4e987f
+RMD160 (rust-1.33.0-x86_64-unknown-freebsd.tar.gz) = fd6564223b374633cf3cd15bc5cba36d9fe56004
+SHA512 (rust-1.33.0-x86_64-unknown-freebsd.tar.gz) = c73e3a2b73520f9ba762d8d67dea94812ac2e99d7e8e9eecf72555a546f8304ca4cb375f1d0a0f8dd40392772af29db74327682df646111de5233cad9cd19741
+Size (rust-1.33.0-x86_64-unknown-freebsd.tar.gz) = 182325902 bytes
+SHA1 (rust-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 9747ec15f4c2956cd9aa663abf21c44b25831deb
+RMD160 (rust-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 2954ded41c821be48a8a797f516a955b5529a01b
+SHA512 (rust-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 34bbeba1cfcc9f3c7856b004e571fd08fc468f59840b7c325ebeb8d343a578b2fac429ce124bca189c67cfdb63e2e140d36452192497f3aaa259be871992cd6c
+Size (rust-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 255441266 bytes
+SHA1 (rust-1.33.0-x86_64-unknown-netbsd.tar.gz) = f77053d8bee2591e31261f17de94a68c36f0c0fa
+RMD160 (rust-1.33.0-x86_64-unknown-netbsd.tar.gz) = c13af0920efeb633585badad0743b664f476e367
+SHA512 (rust-1.33.0-x86_64-unknown-netbsd.tar.gz) = 26deb86f0fb8cdcd28821e578cb0d24d34eead8bbb1d24c704760d8ab105dde923715df2bdd4ab1710a210ba065d01f44017165cb849c5c6d5dce1fa39bb5bcf
+Size (rust-1.33.0-x86_64-unknown-netbsd.tar.gz) = 184114379 bytes
 SHA1 (rust-std-1.33.0-aarch64-unknown-netbsd.tar.gz) = c9381ad84c55bb3f473c04876383b541791c8678
 RMD160 (rust-std-1.33.0-aarch64-unknown-netbsd.tar.gz) = 9625fa444b7b30639066686f45c9ffaf2e4a4af1
 SHA512 (rust-std-1.33.0-aarch64-unknown-netbsd.tar.gz) = 05e2063e9ecff4d297677178eb16a668cf8ca6e70ebfb176ed74ebfee265f5eb32c490bd7bb00657a1ed52f7f4fc52de13759688fe848d5ecf9028f4cbb0fae9
@@ -88,6 +60,18 @@ SHA1 (rust-std-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = 47e5e094bc71918d4424
 RMD160 (rust-std-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = 1df0bd504ec226be379fd327b0de489f5daee50c
 SHA512 (rust-std-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = e854f3bbaf813970bd5299ab0547c08c13bf7ef13eb2fcdf3b78e13eebd2daf652ad59b3872ff769f7df469ff01c2866fd1d08d77d5dd0a38248c03efb4aa1af
 Size (rust-std-1.33.0-armv7-unknown-netbsd-eabihf.tar.gz) = 76262479 bytes
+SHA1 (rust-std-1.33.0-i686-apple-darwin.tar.gz) = 60e3dfedd94d5f18741316d26def9343677b019e
+RMD160 (rust-std-1.33.0-i686-apple-darwin.tar.gz) = 0c7e7f4987409ebc522ef3be70e634c9b0460c8d
+SHA512 (rust-std-1.33.0-i686-apple-darwin.tar.gz) = 388afefdb8c0641876f4512933809e07f3f9792c216550e0c97175ad24a636acafba853be57a1dbb1b9c9397183c5663501cffc061ac5b510b020978b4d63df8
+Size (rust-std-1.33.0-i686-apple-darwin.tar.gz) = 66061870 bytes
+SHA1 (rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 47a0be0a72240b04bbeb29ead8eb986c937605d6
+RMD160 (rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 33e8f6a403e75015211c969b299b64c1cb794efa
+SHA512 (rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = d594bceb6825109b58f3f8a3e6cebc309c9c6deb7eb57684b9087be7db2190203d30ced210346891e150e1503d265ff926a10820e1fe61c48e7d6f128f34448d
+Size (rust-std-1.33.0-i686-unknown-freebsd.tar.gz) = 72221278 bytes
+SHA1 (rust-std-1.33.0-i686-unknown-linux-gnu.tar.gz) = b51dd6831ad67d9d9139274a8fad5738cf8de981
+RMD160 (rust-std-1.33.0-i686-unknown-linux-gnu.tar.gz) = 26482e584f7da1a214dceec765ca95dc2f27b90d
+SHA512 (rust-std-1.33.0-i686-unknown-linux-gnu.tar.gz) = 6debedfb58e0344534aafc2a4cb0e8b16810990dc8b56314d83c9cf330a2aa189062d6546a43c7ad449b343c9da506fbc55bb4023e436e67c368759663cce353
+Size (rust-std-1.33.0-i686-unknown-linux-gnu.tar.gz) = 75157941 bytes
 SHA1 (rust-std-1.33.0-i686-unknown-netbsd.tar.gz) = f2dc315f0d7ab8323fcfa68f1f705558df7c5137
 RMD160 (rust-std-1.33.0-i686-unknown-netbsd.tar.gz) = c23f6415336e6aa02e87dde26d6cc16f3b615cec
 SHA512 (rust-std-1.33.0-i686-unknown-netbsd.tar.gz) = 372f5685c274daf1a943487f7a9eb5ee199c4d01ca7737417d9267b3e151af62c1908f45cd1057486a01e34511b6e7f44f21dab1441d7dad07b8491d7c1c6f00
@@ -100,29 +84,44 @@ SHA1 (rust-std-1.33.0-sparc64-unknown-netbsd.tar.gz) = 7a6a0e9784863f1abe5ff4751
 RMD160 (rust-std-1.33.0-sparc64-unknown-netbsd.tar.gz) = d562cf4bf2dbe2cee6ed857cb0e0381c850d94a2
 SHA512 (rust-std-1.33.0-sparc64-unknown-netbsd.tar.gz) = f953032bcbd0f05fa013e88a9553759e04709965abd3a1c58b70d6fb18c2faec35c11b911c6749f0dd40828be5ef17835b6b681169e83e266acd9ed842e894e3
 Size (rust-std-1.33.0-sparc64-unknown-netbsd.tar.gz) = 76011799 bytes
-SHA1 (rustc-1.33.0-src.tar.gz) = 9a1b68d7749a915d6c5ec70d89907c667a25f2f8
-RMD160 (rustc-1.33.0-src.tar.gz) = 08e6ebf13f9d83311e21b5994dbd5d324a272c83
-SHA512 (rustc-1.33.0-src.tar.gz) = 65ae2615f4639ccea146fc431aca62e6f0793aa5e584e786e706eefb30588056080300fd5752ce9226067dc213f1a468f96c21b2334f22c5751fa90ddbd3a2b4
-Size (rustc-1.33.0-src.tar.gz) = 159251963 bytes
+SHA1 (rust-std-1.33.0-x86_64-apple-darwin.tar.gz) = 35281b96dcaad4893a8aaa1d672a3e3c8f24c763
+RMD160 (rust-std-1.33.0-x86_64-apple-darwin.tar.gz) = 76632e142648b73682b7fbe248aab34041c51191
+SHA512 (rust-std-1.33.0-x86_64-apple-darwin.tar.gz) = 6b21d1093fbcf39d9b73529b47945fdd330de8734d2c0447335fd8c041f1860c63dddd2eb17dd9996234cbee846ba0054aa6e452a14659df36da80e4e45e1176
+Size (rust-std-1.33.0-x86_64-apple-darwin.tar.gz) = 67062787 bytes
+SHA1 (rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 16377aa78388e65fc14d99d16a2409fdc77a3dbc
+RMD160 (rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 7aaf67aee51f8109faa5c0ea95db39e55f8e4d44
+SHA512 (rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = f079d04bf9f3af7badcc067b3b3eff84afa46016ff446bea568dcf6ec8bce9ce7b1dbd09dde7f904f4865c23d5623e7d5b98dfd844ad301a7f605630d125bdbf
+Size (rust-std-1.33.0-x86_64-unknown-freebsd.tar.gz) = 71459727 bytes
+SHA1 (rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = ddacb6675f15be101b7ff3e8e035419f29f4f5f0
+RMD160 (rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 2ec94717716391a69f05e6152017ff1db49b0eb0
+SHA512 (rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = f3f1e519696da3d78c415bfdc27a241d01a6c34e95190f3375753d6b35547d70e5030f2f2ecb41da57a295ae79af4e7e704ccc0db88e71183cf1b0dc484cf462
+Size (rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.gz) = 76338216 bytes
+SHA1 (rust-std-1.33.0-x86_64-unknown-netbsd.tar.gz) = b6dd37c285218f9b7e207bd170e7aeec618936a7
+RMD160 (rust-std-1.33.0-x86_64-unknown-netbsd.tar.gz) = c6acefb07601430abd6e775046827a143e37dc67
+SHA512 (rust-std-1.33.0-x86_64-unknown-netbsd.tar.gz) = 4731cb39eeb3067abe130fef4aebfda808fb3054ce519d517495acf7a363767bcd32c9583ef2b44fbf88e3fb670348c6355e986da4b44b12a8c47fe0b6c75897
+Size (rust-std-1.33.0-x86_64-unknown-netbsd.tar.gz) = 71379733 bytes
+SHA1 (rustc-1.34.0-src.tar.gz) = 9c7da35082a3812e6508795eee21543456167286
+RMD160 (rustc-1.34.0-src.tar.gz) = 561f3bcddefafadc2ddf2a467472d4ffd7c5c2af
+SHA512 (rustc-1.34.0-src.tar.gz) = 00071329577f90eb93fbfc74a1e4167e77be2a94cc5d2b3168ab7af1d5546d64bcf5701d81ac054cfb7d9a6cc2c6638fc67f01c4826d9fc5fca89151c17f50d6
+Size (rustc-1.34.0-src.tar.gz) = 149930034 bytes
 SHA1 (patch-src_bootstrap_bin_rustc.rs) = 5e6b0cb25401db4fef6e74f73764e69f3c09569c
 SHA1 (patch-src_bootstrap_bootstrap.py) = 5b886b95857bf019c2e37cb380e6905cb444b756
 SHA1 (patch-src_bootstrap_builder.rs) = 7e23348dc5555fdb3833a7f8734cfe687c6e533c
 SHA1 (patch-src_bootstrap_lib.rs) = bc23743f1b9c4ad3d7557b4fdf8a55976ca7f417
-SHA1 (patch-src_librustc__llvm_build.rs) = 1884a79d174f8635b384acfac8898a20ebfd6376
+SHA1 (patch-src_librustc__llvm_build.rs) = d5540a34a8f3b7f74d0a2f8775a273640bbd12bf
 SHA1 (patch-src_libstd_build.rs) = 2334879e4b730014de08bb2dfff1a643292a630e
 SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a
 SHA1 (patch-src_libsyntax__pos_span__encoding.rs) = c891cffab8ae47b13b3b391ddd1a6c62ee2b38f3
 SHA1 (patch-src_libunwind_build.rs) = c0a0aa9749705be07afe8eaaa0c7d70affa46566
-SHA1 (patch-src_llvm_CMakeLists.txt) = ffdf4337fdc84d8314c97c4e492e6b84244a99d1
-SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = f0620ac62ecfb1d62d2dfa61b4c063d21c29b8f5
-SHA1 (patch-src_llvm_include_llvm-c_DataTypes.h) = 432693204912e79059ee31e815ad1e24f3236374
-SHA1 (patch-src_llvm_include_llvm_Analysis_ConstantFolding.h) = 861089ea7ec8985b9b9fce53ffadfa3e9eed4a72
+SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
+SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 19daf5f8a26bfaebca942b5cbe8521fb060fe8d9
+SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a
+SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6
 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80
-SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = e9185994af936e0a4f000a03f94e272f95de6280
-SHA1 (patch-src_tools_rls_src_cmd.rs) = 754bfb8806e209cb0ef01690b48bf4b145017ab9
-SHA1 (patch-src_tools_rls_src_server_io.rs) = 74b90c1aeb70b0c3a20709145d6568ddf4647877
+SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = b50d65cfd2fea4793bcbec2515f5fc0203052ac0
+SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7
+SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 23944fa3599c0b75b67d7a8006bc4b308e507b7e
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2
-SHA1 (patch-src_tools_tidy_src_features.rs) = 229be34bb91ce50ceeb69bee3833bba77600afda
 SHA1 (patch-vendor_backtrace-sys_src_libbacktrace_configure) = 90e54f66edce65ebe23fbf2480deb193ca926733
 SHA1 (patch-vendor_libc_src_unix_solaris_mod.rs) = 1fd66c000eeae9b61e5e05c46604c574d2b2106c
 SHA1 (patch-vendor_rand-0.5.5_src_rngs_os.rs) = b9579d3f1e30ad2cd2353cb02efc0afa1d5dfa1c
diff --git a/lang/rust/patches/patch-src_librustc__llvm_build.rs b/lang/rust/patches/patch-src_librustc__llvm_build.rs
index 3190900b59f7..bba4a1f2621e 100644
--- a/lang/rust/patches/patch-src_librustc__llvm_build.rs
+++ b/lang/rust/patches/patch-src_librustc__llvm_build.rs
@@ -1,14 +1,13 @@
-$NetBSD: patch-src_librustc__llvm_build.rs,v 1.3 2019/03/07 20:19:11 jperkin Exp $
+$NetBSD: patch-src_librustc__llvm_build.rs,v 1.4 2019/04/14 12:42:03 he Exp $
 
 fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
---- src/librustc_llvm/build.rs.orig	2018-12-18 23:11:17.000000000 +0000
+--- src/librustc_llvm/build.rs.orig	2019-04-10 18:45:55.000000000 +0000
 +++ src/librustc_llvm/build.rs
-@@ -244,8 +244,14 @@ fn main() {
-     } else if target.contains("freebsd") {
+@@ -246,7 +246,13 @@ fn main() {
          "c++"
      } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
--        // NetBSD uses a separate library when relocation is required
+         // NetBSD uses a separate library when relocation is required
 -        "stdc++_pic"
 +        // NetBSD uses a separate library when relocation is required
 +        if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
diff --git a/lang/rust/patches/patch-src_llvm_CMakeLists.txt b/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
similarity index 74%
rename from lang/rust/patches/patch-src_llvm_CMakeLists.txt
rename to lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index 47f82303f3a8..c0bacd732767 100644
--- a/lang/rust/patches/patch-src_llvm_CMakeLists.txt
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_llvm_CMakeLists.txt,v 1.1 2018/06/21 17:13:13 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.1 2019/04/14 12:42:03 he Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
---- src/llvm/CMakeLists.txt.orig	2018-03-10 02:51:13.000000000 +0000
-+++ src/llvm/CMakeLists.txt
+--- src/llvm-project/llvm/CMakeLists.txt.orig	2018-03-10 02:51:13.000000000 +0000
++++ src/llvm-project/llvm/CMakeLists.txt
 @@ -806,11 +806,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBS
    link_directories("/usr/local/lib")
  endif(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
diff --git a/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake b/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
similarity index 81%
rename from lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake
rename to lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
index cb36efeea276..bde870ea4310 100644
--- a/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_llvm_cmake_modules_AddLLVM.cmake,v 1.3 2018/09/24 03:42:42 minskim Exp $
+$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.1 2019/04/14 12:42:03 he Exp $
 
 "-z discard-unused" is only supported by Oracle Solaris ld.
 On Darwin, use correct install-name for shared libraries.
 
---- src/llvm/cmake/modules/AddLLVM.cmake.orig	2018-08-01 16:32:37.000000000 +0000
-+++ src/llvm/cmake/modules/AddLLVM.cmake
+--- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig	2018-08-01 16:32:37.000000000 +0000
++++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
 @@ -219,8 +219,6 @@ function(add_link_opts target_name)
          set_property(TARGET ${target_name} APPEND_STRING PROPERTY
                       LINK_FLAGS " -Wl,-dead_strip")
diff --git a/lang/rust/patches/patch-src_llvm_include_llvm-c_DataTypes.h b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
similarity index 65%
rename from lang/rust/patches/patch-src_llvm_include_llvm-c_DataTypes.h
rename to lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
index 7f7669f4a028..6e8f9b1cddca 100644
--- a/lang/rust/patches/patch-src_llvm_include_llvm-c_DataTypes.h
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_llvm_include_llvm-c_DataTypes.h,v 1.1 2018/09/14 10:04:43 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.1 2019/04/14 12:42:03 he Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
---- src/llvm/include/llvm-c/DataTypes.h.orig	2018-08-01 16:32:37.000000000 +0000
-+++ src/llvm/include/llvm-c/DataTypes.h
+--- src/llvm-project/llvm/include/llvm-c/DataTypes.h.orig	2018-08-01 16:32:37.000000000 +0000
++++ src/llvm-project/llvm/include/llvm-c/DataTypes.h
 @@ -87,4 +87,27 @@ typedef signed int ssize_t;
  #define HUGE_VALF (float)HUGE_VAL
  #endif
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
new file mode 100644
index 000000000000..42a14ee2e90d
--- /dev/null
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.1 2019/04/14 12:42:03 he Exp $
+
+Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
+
+--- src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h.orig	2018-08-01 16:32:37.000000000 +0000
++++ src/llvm-project/llvm/include/llvm/Analysis/ConstantFolding.h
+@@ -20,6 +20,10 @@
+ #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
+ #define LLVM_ANALYSIS_CONSTANTFOLDING_H
+ 
++#ifdef __sun
++#undef CS
++#endif
++
+ namespace llvm {
+ class APInt;
+ template <typename T> class ArrayRef;
diff --git a/lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h b/lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h
deleted file mode 100644
index 493b8d582627..000000000000
--- a/lang/rust/patches/patch-src_llvm_include_llvm_Analysis_ConstantFolding.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.1 2018/09/14 10:04:43 jperkin Exp $
-
-Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
-
---- src/llvm/include/llvm/Analysis/ConstantFolding.h.orig	2018-08-01 16:32:37.000000000 +0000
-+++ src/llvm/include/llvm/Analysis/ConstantFolding.h
-@@ -20,6 +20,10 @@
- #ifndef LLVM_ANALYSIS_CONSTANTFOLDING_H
- #define LLVM_ANALYSIS_CONSTANTFOLDING_H
- 
-+#ifdef __sun
-+#undef CS
-+#endif
-+
- namespace llvm {
- class APInt;
- template <typename T> class ArrayRef;
diff --git a/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
index 987123b878b4..abbec730b2ce 100644
--- a/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
+++ b/lang/rust/patches/patch-src_tools_cargo_tests_testsuite_build.rs
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.3 2019/03/03 09:16:21 he Exp $
+$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.4 2019/04/14 12:42:03 he Exp $
 
 Don't attempt incremental operations on sparc64, ref.
 https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
 
---- src/tools/cargo/tests/testsuite/build.rs.orig	2018-10-24 20:01:28.000000000 +0000
+--- src/tools/cargo/tests/testsuite/build.rs.orig	2019-04-10 18:46:16.000000000 +0000
 +++ src/tools/cargo/tests/testsuite/build.rs
 @@ -38,6 +38,7 @@ fn cargo_fail_with_no_stderr() {
  
- /// Check that the `CARGO_INCREMENTAL` environment variable results in
- /// `rustc` getting `-Zincremental` passed to it.
+ /// Checks that the `CARGO_INCREMENTAL` environment variable results in
+ /// `rustc` getting `-C incremental` passed to it.
 +#[cfg(not(target_arch = "sparc64"))]
  #[test]
  fn cargo_compile_incremental() {
diff --git a/lang/rust/patches/patch-src_tools_rls_src_cmd.rs b/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
similarity index 64%
rename from lang/rust/patches/patch-src_tools_rls_src_cmd.rs
rename to lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
index f5b659fdd6dd..bb99f197b047 100644
--- a/lang/rust/patches/patch-src_tools_rls_src_cmd.rs
+++ b/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
@@ -1,7 +1,10 @@
-$NetBSD: patch-src_tools_rls_src_cmd.rs,v 1.1 2018/12/21 23:12:34 he Exp $
+$NetBSD: patch-src_tools_rls_rls_src_cmd.rs,v 1.1 2019/04/14 12:42:03 he Exp $
 
---- src/tools/rls/src/cmd.rs.orig	2018-12-18 23:12:41.000000000 +0000
-+++ src/tools/rls/src/cmd.rs
+Use 32-bit atomic instead of 64-bit; latter may not be available on
+32-bit platforms (powerpc, earmv7).
+
+--- src/tools/rls/rls/src/cmd.rs.orig	2019-04-10 18:46:16.000000000 +0000
++++ src/tools/rls/rls/src/cmd.rs
 @@ -17,7 +17,7 @@ use crate::config::Config;
  use crate::server::{self, LsService, Notification, Request, RequestId};
  use rls_analysis::{AnalysisHost, Target};
@@ -9,9 +12,9 @@ $NetBSD: patch-src_tools_rls_src_cmd.rs,v 1.1 2018/12/21 23:12:34 he Exp $
 -use std::sync::atomic::{AtomicU64, Ordering};
 +use std::sync::atomic::{AtomicU32, Ordering};
  
- use languageserver_types::{
+ use lsp_types::{
      ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem,
-@@ -424,8 +424,8 @@ fn url(file_name: &str) -> Url {
+@@ -323,8 +323,8 @@ fn url(file_name: &str) -> Url {
  }
  
  fn next_id() -> RequestId {
diff --git a/lang/rust/patches/patch-src_tools_rls_src_server_io.rs b/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
similarity index 56%
rename from lang/rust/patches/patch-src_tools_rls_src_server_io.rs
rename to lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
index 8cd1aeb5ffce..bf6c24a1b874 100644
--- a/lang/rust/patches/patch-src_tools_rls_src_server_io.rs
+++ b/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
@@ -1,7 +1,10 @@
-$NetBSD: patch-src_tools_rls_src_server_io.rs,v 1.1 2018/12/21 23:12:34 he Exp $
+$NetBSD: patch-src_tools_rls_rls_src_server_io.rs,v 1.1 2019/04/14 12:42:03 he Exp $
 
---- src/tools/rls/src/server/io.rs.orig	2018-12-18 23:12:41.000000000 +0000
-+++ src/tools/rls/src/server/io.rs
+Use 32-bit atomic instead of 64-bit; latter may not be available on
+32-bit platforms (powerpc, earmv7).
+
+--- src/tools/rls/rls/src/server/io.rs.orig	2019-04-10 18:46:16.000000000 +0000
++++ src/tools/rls/rls/src/server/io.rs
 @@ -17,7 +17,7 @@ use crate::lsp_data::{LSPNotification, L
  
  use std::fmt;
@@ -11,7 +14,7 @@ $NetBSD: patch-src_tools_rls_src_server_io.rs,v 1.1 2018/12/21 23:12:34 he Exp $
  use std::sync::Arc;
  
  use jsonrpc_core::{self as jsonrpc, response, version, Id};
-@@ -190,14 +190,14 @@ pub trait Output: Sync + Send + Clone + 
+@@ -182,13 +182,13 @@ pub trait Output: Sync + Send + Clone + 
  /// An output that sends notifications and responses on `stdout`.
  #[derive(Clone)]
  pub(super) struct StdioOutput {
@@ -21,14 +24,13 @@ $NetBSD: patch-src_tools_rls_src_server_io.rs,v 1.1 2018/12/21 23:12:34 he Exp $
  
  impl StdioOutput {
      /// Construct a new `stdout` output.
-     crate fn new() -> StdioOutput {
-         StdioOutput {
--            next_id: Arc::new(AtomicU64::new(1)),
-+            next_id: Arc::new(AtomicU32::new(1)),
-         }
+     pub(crate) fn new() -> StdioOutput {
+-        StdioOutput { next_id: Arc::new(AtomicU64::new(1)) }
++        StdioOutput { next_id: Arc::new(AtomicU32::new(1)) }
      }
  }
-@@ -215,7 +215,7 @@ impl Output for StdioOutput {
+ 
+@@ -205,7 +205,7 @@ impl Output for StdioOutput {
      }
  
      fn provide_id(&self) -> RequestId {
diff --git a/lang/rust/patches/patch-src_tools_tidy_src_features.rs b/lang/rust/patches/patch-src_tools_tidy_src_features.rs
deleted file mode 100644
index afad86dbb9c9..000000000000
--- a/lang/rust/patches/patch-src_tools_tidy_src_features.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_tools_tidy_src_features.rs,v 1.1 2019/03/06 16:51:53 rin Exp $
-
-Fix build for rust 1.33.0;
-trim_left_matches has been superseded by trim_start_matches.
-
---- src/tools/tidy/src/features.rs.orig	2019-03-07 00:36:26.836890152 +0900
-+++ src/tools/tidy/src/features.rs	2019-03-07 00:36:45.715999809 +0900
-@@ -188,7 +188,7 @@ pub fn collect_lang_features(base_src_pa
-             }
- 
-             let mut parts = line.split(',');
--            let level = match parts.next().map(|l| l.trim().trim_left_matches('(')) {
-+            let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) {
-                 Some("active") => Status::Unstable,
-                 Some("removed") => Status::Removed,
-                 Some("accepted") => Status::Stable,