diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index be37f846a16d..204bed26319a 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.246 2021/09/29 19:00:52 adam Exp $
+# $NetBSD: Makefile,v 1.247 2021/11/20 16:09:45 he Exp $
 
-DISTNAME=	rustc-1.54.0-src
+DISTNAME=	rustc-1.56.1-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 
@@ -42,7 +41,6 @@ CONFIGURE_ARGS+=		--local-rust-root=${RUST_BOOTSTRAP_PATH}
 CONFIGURE_ARGS+=		--enable-extended	# Build and install cargo too.
 CONFIGURE_ARGS+=		--enable-rpath
 CONFIGURE_ARGS+=		--disable-codegen-tests
-CONFIGURE_ARGS+=		--disable-docs
 CONFIGURE_ARGS+=		--disable-compiler-docs
 CONFIGURE_ARGS+=		--disable-dist-src
 CONFIGURE_ARGS+=		--disable-llvm-static-stdcpp
@@ -176,7 +174,7 @@ BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
 DISTFILES:=		${DEFAULT_DISTFILES}
 
 .if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH:=		aarch64-apple-darwin
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -184,7 +182,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.53.0
+RUST_STAGE0_VER=	1.55.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
@@ -192,7 +190,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH:=		aarch64-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
@@ -200,7 +198,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv6hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH:=		arm-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -208,7 +206,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MLinux-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH:=		armv7-unknown-linux-gnueabihf
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -216,7 +214,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.53.0
+RUST_STAGE0_VER=	1.55.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
@@ -224,7 +222,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.53.0
+RUST_STAGE0_VER=	1.55.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
@@ -237,7 +235,7 @@ pre-build-fix:
 # x86_64-sun-solaris bootstrap and comment out the overrides.
 #
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH:=		x86_64-unknown-illumos
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 SITES.${RUST_STAGE0}=	https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -251,7 +249,7 @@ CONFIGURE_ARGS+=	--target=${RUST_ARCH}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.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
@@ -259,7 +257,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH=		i586-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -277,7 +275,7 @@ pre-build-fix:
 	${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.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
@@ -285,7 +283,7 @@ DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH=		powerpc-unknown-netbsd
 
 # Cross-built against NetBSD 9.0
@@ -309,7 +307,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH=		aarch64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -319,7 +317,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64eb) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH=		aarch64_be-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -329,7 +327,7 @@ SITES.${RUST_STD_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_ARCH=		sparc64-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
@@ -340,7 +338,7 @@ pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make (makesum) || make(mdi)
 RUST_ARCH=		armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER=	1.53.0
+RUST_STAGE0_VER=	1.55.0
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -379,13 +377,9 @@ SUBST_VARS.rpath=	PREFIX
 # than one substitution entry per file, but are kept separate below to ease
 # updating and verification.
 #
-CKSUM_CRATES+=	vendor/libc
-CKSUMS+=	be9f7a37d17a7616f6dbebd871fe4ae83612af6b582ebf153284cff1e7162334
-CKSUMS+=	42042ac121c0798f62db50afe41dde216e443fc836533c0904cb2e5ce810f377
-
 CKSUM_CRATES+=	vendor/cc
-CKSUMS+=	20d349f8528f191a4cf04a5a42daaaa8085c4e00885c78456ebada92dc39b7fb
-CKSUMS+=	62b77767b4bd16a3e636025ab9966846d7c800fa51d602efe31be137f5633847
+CKSUMS+=	6dde684bdcc1bb03a808784ce8ccc0721f53bfdf87b84c607045aada916730ba
+CKSUMS+=	1244e301c58e7f693f14ad23b02713cdd38259928a6ca905336891e869e6743e
 
 CKSUM_CRATES+=	vendor/rustc-ap-rustc_target
 CKSUMS+=	673ac3b6875d487ace59b01725d83d2fab4af60615d1f8edd95bf21295947433
@@ -399,13 +393,13 @@ CKSUM_CRATES+=	vendor/stacker
 CKSUMS+=	cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e
 CKSUMS+=	79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
 
-CKSUM_CRATES+=	vendor/net2
-CKSUMS+=	fd072307ebbaa01cfe1fd7553d7f42d27093b2bd32dd81d419d2e1c9423495a0
-CKSUMS+=	9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12
+CKSUM_CRATES+=	vendor/libc
+CKSUMS+=	a5e87e2197011ceae4d6aa1bc8a16d2e01dd39583448e6809f32ba58143baee9
+CKSUMS+=	37f836ea5d2cf334e171b0fc01ac00c7c8ca74f0066d02d22ff15854fe1670ce
 
 CKSUM_CRATES+=	vendor/openssl-src
-CKSUMS+=	7de257c6ecb5d3ea0361ced4e0d9d4b2eb6d10abac3d78cd3a2a896e25e3221d
-CKSUMS+=	8d67b3b667a8aaf34be5ee69f9b5d1df5e0cb91d8571a7e4b48da111755ec662
+CKSUMS+=	65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196
+CKSUMS+=	7ff3cb1d807d93defda37c2ec01e01223295bcc3d20d218436c07e89cae80fe2
 
 SUBST_CLASSES+=		cksum
 SUBST_STAGE.cksum=	pre-configure
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 080d53bb9030..a48320e3e564 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,138 +1,134 @@
-$NetBSD: distinfo,v 1.138 2021/10/07 14:21:12 nia Exp $
+$NetBSD: distinfo,v 1.139 2021/11/20 16:09:45 he Exp $
 
-RMD160 (rust-1.53.0-aarch64-apple-darwin.tar.gz) = 8d3bc151689e286fef22edb87cf097eab0905fd0
-SHA512 (rust-1.53.0-aarch64-apple-darwin.tar.gz) = 2429b45a0ed689ca232e630cedafff4575f0815335f1b8e889b84458b5466e1a77172554d56a37feb8dbe3bd7ff333a922f3386e8359b07d79032cd49e0cbc5d
-Size (rust-1.53.0-aarch64-apple-darwin.tar.gz) = 274877370 bytes
-RMD160 (rust-1.53.0-aarch64-unknown-linux-gnu.tar.gz) = b38320cbdd69c0260de20a9e42fc07a82815ca38
-SHA512 (rust-1.53.0-aarch64-unknown-linux-gnu.tar.gz) = 02ee2f832cd9008283a3bfedb732d3035eed16073164b7bf1e7d8586559c273296b51513b16481c317426c957fdeedd447ea19efd133303ae7fb92f5307634dd
-Size (rust-1.53.0-aarch64-unknown-linux-gnu.tar.gz) = 366640616 bytes
-RMD160 (rust-1.53.0-aarch64-unknown-netbsd.tar.gz) = bb292d9dd7800bbdeb8d1df868f1f901082444eb
-SHA512 (rust-1.53.0-aarch64-unknown-netbsd.tar.gz) = db8c6865749c5536d3c5524e8d314d353b4857bd6845f9e5f9d467a39faa9c41afe02aca2c1a6dd0414ea878c0eaf3b87ba9d8c660b9c29fee0231fc69e81e51
-Size (rust-1.53.0-aarch64-unknown-netbsd.tar.gz) = 241013291 bytes
-RMD160 (rust-1.53.0-aarch64_be-unknown-netbsd.tar.gz) = b92a88800c393a183f076d638928b2558661813b
-SHA512 (rust-1.53.0-aarch64_be-unknown-netbsd.tar.gz) = 607526625dc793b5a0c24da2a64dd76b9f40597ee01a3f934df1af2b96f2700c1ba2973347f373bbed512be40af49a2274c44a68fe2ba86aa176323ba6b6fda1
-Size (rust-1.53.0-aarch64_be-unknown-netbsd.tar.gz) = 245435734 bytes
-RMD160 (rust-1.53.0-arm-unknown-linux-gnueabihf.tar.gz) = c5fb560739cffe3a49fd9a1df98d4686f6b8e942
-SHA512 (rust-1.53.0-arm-unknown-linux-gnueabihf.tar.gz) = cd0449e8879e73fe03bd412f040b7bd7986ee1aa69db68f2b7e3356c17a50674528c4323b4352756863155f6ad1c54a2776642b7491d48a33d9f1bddef7493be
-Size (rust-1.53.0-arm-unknown-linux-gnueabihf.tar.gz) = 308497403 bytes
-RMD160 (rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.gz) = a5c22c4cad302e9a8e427c1b8087502f0fdeeca5
-SHA512 (rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.gz) = f302a0d7754a80077c3db59522d23cbe54968114a7d734042cec71c184bf6041b7738a5469a5e54129ee15d8e958023c26adf7d180353743b79971f61e015b68
-Size (rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.gz) = 299085653 bytes
-RMD160 (rust-1.53.0-armv7-unknown-netbsd-eabihf.tar.gz) = cbc3b864405e7956e0cd573ac3e77d489b534b1d
-SHA512 (rust-1.53.0-armv7-unknown-netbsd-eabihf.tar.gz) = 50002452f1780724a47bd9b1634a9e8f770e25ffeb06f2e400e53cbe6d34f0e11f894f03d1dde5bfa3b66a266b8686c92efa6576df46a0c7dcc8dd3fa65d7788
-Size (rust-1.53.0-armv7-unknown-netbsd-eabihf.tar.gz) = 211153302 bytes
-RMD160 (rust-1.53.0-i586-unknown-netbsd.tar.gz) = 7ae63f4462519e488e5bdad9ef79e186bce09a7e
-SHA512 (rust-1.53.0-i586-unknown-netbsd.tar.gz) = 10bb609c2645cb1a663108f350a4e4b9630e215a963e8eb2c327cc17b2fdb2039f91663471c2a3aa55e701fe143707f8090a4888bb88eff6b77be2cd7dafb0cd
-Size (rust-1.53.0-i586-unknown-netbsd.tar.gz) = 264383887 bytes
-RMD160 (rust-1.53.0-i686-unknown-linux-gnu.tar.gz) = db5bc944a0cc127aa63fcdc72da965cf80ca9142
-SHA512 (rust-1.53.0-i686-unknown-linux-gnu.tar.gz) = 487f056798c581de0a7da931c305af5dc7e8ed9ac4c3fd88191b16a2a37ed70db7eb3e34b5abe70863138e10f58567b930337be4d3197215ed3f43f2c025f3fd
-Size (rust-1.53.0-i686-unknown-linux-gnu.tar.gz) = 362017076 bytes
-RMD160 (rust-1.53.0-powerpc-unknown-netbsd.tar.gz) = 8fec9b3137721e3a5d6f7bfc261d1ad65734bbff
-SHA512 (rust-1.53.0-powerpc-unknown-netbsd.tar.gz) = 0b9a053fd414beba0328b815266f14f9a0b8f39f961164778775b18a7b9a04208854c2a1e0d16e1e42a9b2d58837d85afc80ae03bfef6fffda2429f6f2134052
-Size (rust-1.53.0-powerpc-unknown-netbsd.tar.gz) = 272501050 bytes
-RMD160 (rust-1.53.0-powerpc-unknown-netbsd90.tar.gz) = 32ebb0e766682497986aaef97fa0c0e413ed8442
-SHA512 (rust-1.53.0-powerpc-unknown-netbsd90.tar.gz) = 303cf2215125c55d49318c0586788da1fdc321f3016124f67086dca9af28d6a24d3a0ab99fe5b83134492bb3391a861bd6764450589c5ce59ee6a429714dbb35
-Size (rust-1.53.0-powerpc-unknown-netbsd90.tar.gz) = 277785194 bytes
-RMD160 (rust-1.53.0-sparc64-unknown-netbsd.tar.gz) = 3c8c11a457eb8e4eac51d81332eb24840c4afa1e
-SHA512 (rust-1.53.0-sparc64-unknown-netbsd.tar.gz) = 5b98dccee4fe91afb700addd8eea80b35781c97870edeb4421731e0a69cee78315a1a0de2fc7cd1784486e93f3c16c56edc1a2368b533b8f0b30d6d6b2822ae7
-Size (rust-1.53.0-sparc64-unknown-netbsd.tar.gz) = 254650667 bytes
-RMD160 (rust-1.53.0-x86_64-apple-darwin.tar.gz) = e34cd43dda4a69dfdcc857a00114ebcd43dc5f47
-SHA512 (rust-1.53.0-x86_64-apple-darwin.tar.gz) = 38a516a2584bf4b1f9580eb2f1815a17775dc62c637d1994a073c7aeb5b1a3cbb2646171beba9ff77a0d456f59194efbc2d5bf6f1bb0b61e59a2dd3cc02dca6b
-Size (rust-1.53.0-x86_64-apple-darwin.tar.gz) = 298136926 bytes
-RMD160 (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = e5d2678cdbbd8a400c5d33d41286133098ac59ec
-SHA512 (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = e9eb71412defd6bcc61fe07b0c7103ab0f9582dd9d169d8c30158919c3f28327852ee6caa6dd938b2f7b9aad8f054558e42bba99eb557ad024df1c68da456ff4
-Size (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = 287871664 bytes
-RMD160 (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 0f126319ee1ceb3394cc48d96f245c2ae2b0978f
-SHA512 (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 2f1373b61f796c84bc0257c9f83fcc787cafd8d408bdc73a8069287774b06ecf025d222655a2bcbb74bfdbdbe826d6eb3c36454f10370d59e21f39a650fa5bc3
-Size (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 208714201 bytes
-RMD160 (rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 4cd0b7dfd4599f2376097ec05bd9e6f2c7a14e74
-SHA512 (rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 0df9a5116ab7973f229e6a26ec623798c5b68e935e2e8bca9603ffc5f97be669f401473a306d731d46e76b461d60c96dac6926e59d8bd2e0fe779a1319624317
-Size (rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 258759631 bytes
-RMD160 (rust-1.53.0-x86_64-unknown-netbsd.tar.gz) = 9cd16ecc1591d827fd63ee73206d53e0076a4683
-SHA512 (rust-1.53.0-x86_64-unknown-netbsd.tar.gz) = 8a812ea934e27d573f5e08ec10b1e4957be541a2b13814f28deb9f3b4e85b5aa6f87e63fa5ebd9ee7d0c3c5d0cf1fef3f4f1d9458dc1e7a6280623883cfa9acd
-Size (rust-1.53.0-x86_64-unknown-netbsd.tar.gz) = 269580000 bytes
-RMD160 (rust-std-1.53.0-aarch64-apple-darwin.tar.gz) = 1efd3dabb25c322c6fb3a066b4c68d0cbe9cfbfc
-SHA512 (rust-std-1.53.0-aarch64-apple-darwin.tar.gz) = a488faf4445cf0c044eed85f7ef5c3d103ece9f2a2ae5a750e025cd3821006cd6322e69df7413403a73acb073dbe8eda23cc6e869cf0882f8e7505987562f06c
-Size (rust-std-1.53.0-aarch64-apple-darwin.tar.gz) = 29879984 bytes
-RMD160 (rust-std-1.53.0-aarch64-unknown-linux-gnu.tar.gz) = 647d6d12ef1cf2e3d460590d174450d196bb3938
-SHA512 (rust-std-1.53.0-aarch64-unknown-linux-gnu.tar.gz) = a36d9c9d5245ac00f3c944d3b0018dc022074572f68a874bcbd7f64c1803de92bd24d143374eba53f0311f991f09e3cc9c53c48e89d5b2fbbbeaacf02c0f0245
-Size (rust-std-1.53.0-aarch64-unknown-linux-gnu.tar.gz) = 44626631 bytes
-RMD160 (rust-std-1.53.0-aarch64-unknown-netbsd.tar.gz) = d21075814d98d6af9d858fbfa99f8a44650a309b
-SHA512 (rust-std-1.53.0-aarch64-unknown-netbsd.tar.gz) = 331509f3325060e1246db98748beeddb337927d2e8afee71009c74fddf1e585742812447b16640f55084f11b5d25f7a59c6408b99ebe9f7329319b7e2e092ec5
-Size (rust-std-1.53.0-aarch64-unknown-netbsd.tar.gz) = 25259798 bytes
-RMD160 (rust-std-1.53.0-aarch64_be-unknown-netbsd.tar.gz) = ec150abd822c0d054305feed0a367b8113bebcf6
-SHA512 (rust-std-1.53.0-aarch64_be-unknown-netbsd.tar.gz) = 323469c5906d7269d5f7fdf798468cb9674802f36d62b5a742ff58d50c2e86ddd40850eee8a4bb93d4f9745ecb07c78d883b650d8228c984e39aee37d817beea
-Size (rust-std-1.53.0-aarch64_be-unknown-netbsd.tar.gz) = 25264906 bytes
-RMD160 (rust-std-1.53.0-arm-unknown-linux-gnueabihf.tar.gz) = 1c3147d21ac20d6803f545b4cedf959bec61af7f
-SHA512 (rust-std-1.53.0-arm-unknown-linux-gnueabihf.tar.gz) = fe0c28721d3cf2c332b72a07687f68d078e8a0c0a040909403a7c257959f9c0363d7246c2dbcc9c09ebb56ffa223b739935e6c4dcb6285ac588966a824223981
-Size (rust-std-1.53.0-arm-unknown-linux-gnueabihf.tar.gz) = 28634039 bytes
-RMD160 (rust-std-1.53.0-armv7-unknown-linux-gnueabihf.tar.gz) = e0be18e0cf11947cfcf87f08aaa284738332becf
-SHA512 (rust-std-1.53.0-armv7-unknown-linux-gnueabihf.tar.gz) = 7e3a31040192aef8bc6bdad5a752a3cc66c8c24d9b9c6c5569f9c024a677cf0b87e06e017b0df72b85680e3262c02735bfa357c69df789d63e85ba29131ab229
-Size (rust-std-1.53.0-armv7-unknown-linux-gnueabihf.tar.gz) = 28919681 bytes
-RMD160 (rust-std-1.53.0-armv7-unknown-netbsd-eabihf.tar.gz) = 7b13613a37a7023908c9cb3cb8e2a6e48958f27d
-SHA512 (rust-std-1.53.0-armv7-unknown-netbsd-eabihf.tar.gz) = 7b0a424ea3c6b7e7323e69b9c034df9938ee5e0b0562a3db2b7bc4769f4faca97b77be0bc27f2b7ba0f820c3792e648da2bd8959065e4720ec38de9e33303b35
-Size (rust-std-1.53.0-armv7-unknown-netbsd-eabihf.tar.gz) = 25138267 bytes
-RMD160 (rust-std-1.53.0-i586-unknown-netbsd.tar.gz) = 8725264c3d4e9576ba0137c3143e2775d2853897
-SHA512 (rust-std-1.53.0-i586-unknown-netbsd.tar.gz) = df166c8fc7e43c6cb63e9c15ac4992298f8f07a84588a7738fccb6c2174ebbc54ddc56daca8de29416bf6e7160813694ff2028e8854f700ade63435e28668246
-Size (rust-std-1.53.0-i586-unknown-netbsd.tar.gz) = 40381825 bytes
-RMD160 (rust-std-1.53.0-i686-unknown-linux-gnu.tar.gz) = 35912d9fbbe9b63f5cbe7325387621ca78767633
-SHA512 (rust-std-1.53.0-i686-unknown-linux-gnu.tar.gz) = 88116e2a3128fb7ad9a5b1de0467b1458c91b819823f2880c3e80e7360a458e48152fc2fb195e8117de36ac54a5adf86e287064b0606d706518ce8a969e16782
-Size (rust-std-1.53.0-i686-unknown-linux-gnu.tar.gz) = 43922942 bytes
-RMD160 (rust-std-1.53.0-powerpc-unknown-netbsd.tar.gz) = d908829466666241e5327b485a8119413fdee646
-SHA512 (rust-std-1.53.0-powerpc-unknown-netbsd.tar.gz) = e4ae0c1c8b753f50c32225aff97988fb29a8c3ee30273f829536de3454fb9b2598bb2db4c178b1a66340dbfa37497d08f673d379a65fbc4bad0ef16050e0db36
-Size (rust-std-1.53.0-powerpc-unknown-netbsd.tar.gz) = 24655986 bytes
-RMD160 (rust-std-1.53.0-powerpc-unknown-netbsd90.tar.gz) = a6fb80f0506045480e3cdf90ae08b122bcc15001
-SHA512 (rust-std-1.53.0-powerpc-unknown-netbsd90.tar.gz) = a40731bd45a1bd1c94480eb1b95b2a8463884a1ee1093896e4e1e3b1b65322597d847c4e924f7fcb3d5e3431eae25d97566ea083733de6d84272f3f5248ddce4
-Size (rust-std-1.53.0-powerpc-unknown-netbsd90.tar.gz) = 24651130 bytes
-RMD160 (rust-std-1.53.0-sparc64-unknown-netbsd.tar.gz) = aadcaf430553859129b8fa3226a98aecfbd82573
-SHA512 (rust-std-1.53.0-sparc64-unknown-netbsd.tar.gz) = bb94425973f14a0d53d5c69e57d6cd695a9cc360ec8937b375a29647c6f8a367d7d7d026b30395fe9bdb2e220402f5e8681a1cf3cf52e2cec884fe22550fbe65
-Size (rust-std-1.53.0-sparc64-unknown-netbsd.tar.gz) = 24867872 bytes
-RMD160 (rust-std-1.53.0-x86_64-apple-darwin.tar.gz) = ca491f1be8c0cb036776041f3a1f79a89e6327b8
-SHA512 (rust-std-1.53.0-x86_64-apple-darwin.tar.gz) = e2dc9a9c74d8785d44c0e2ebb75c8bb59376e17479531342751495103c935f3dcebccf90a30e7f37890cca3c9e16521690c76e7d3c44f360e495635b6a14b60a
-Size (rust-std-1.53.0-x86_64-apple-darwin.tar.gz) = 45725126 bytes
-RMD160 (rust-std-1.53.0-x86_64-unknown-freebsd.tar.gz) = d48a935aada3e585fc6aa42b8e4fe5399a6d7004
-SHA512 (rust-std-1.53.0-x86_64-unknown-freebsd.tar.gz) = 776e16a312d131a8f783fbef6eb91c7c972f1e6cab06673469f984132ae87d27ba7e1bbc680f2aa7660432fa6791e29b39354f61c45bfbfc0fa97d12d7206d65
-Size (rust-std-1.53.0-x86_64-unknown-freebsd.tar.gz) = 46411113 bytes
-RMD160 (rust-std-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 236bc6291d1404a43f51dde0128de32e5de8b8bc
-SHA512 (rust-std-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = bac648f3222c4e7091e293df89e7da92ae6c204b429188723208910cd27490b94879df66bb4faaf085a7ee549882ef493537c5e12169c13156de1ee5967646dd
-Size (rust-std-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 47924910 bytes
-RMD160 (rust-std-1.53.0-x86_64-unknown-netbsd.tar.gz) = f7794df04533acce39c41feb27d2e8296e74488e
-SHA512 (rust-std-1.53.0-x86_64-unknown-netbsd.tar.gz) = 45421482a979a6a89e431634346fdbdc0d94ba950df2f3ade1bbebd5439a61583dd2d8eb93a2b77b4307a0f3ef394dd1bf4390cb758f2abe1567caa25d0d6389
-Size (rust-std-1.53.0-x86_64-unknown-netbsd.tar.gz) = 43883130 bytes
-RMD160 (rustc-1.54.0-src.tar.gz) = be2de16e2deaf91aee723e631a36f6de52636ddd
-SHA512 (rustc-1.54.0-src.tar.gz) = f6a1d925e233ef40351193e5507d74b1aed13ce516679558c246e6b6955a6ef393d7e61e6c51a0c5696a7e40a9dcee026bea938b954f5ea5394854cc3ca67f90
-Size (rustc-1.54.0-src.tar.gz) = 170480637 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = ce864839b3bce0755b950d914164e707a3f4eb68
+BLAKE2s (rust-1.55.0-aarch64-apple-darwin.tar.gz) = ff99f47885481eaf2fa320d1dcead55ad73c56b440f49064bef6de6a660dcb7f
+SHA512 (rust-1.55.0-aarch64-apple-darwin.tar.gz) = da4f5af7108b776baee99fb4d4df20edb4d5974b893d64e17951dad7595ca66e90f82c421f54c61d422f398227758df7b705317da28317be12dc7e38bcf652e6
+Size (rust-1.55.0-aarch64-apple-darwin.tar.gz) = 291260128 bytes
+BLAKE2s (rust-1.55.0-aarch64-unknown-linux-gnu.tar.gz) = efed781ccab3c1e8eb3ba300ad19c5247158cc6202973716eb11cb46aa6d61ed
+SHA512 (rust-1.55.0-aarch64-unknown-linux-gnu.tar.gz) = 00f70c348b3bd21acc32c2043886616acf937af056ade6a9a230306ead56dafc1e92de150c0e90b5d03448df5ec201ec94d9752db06923d992a435156b9212ed
+Size (rust-1.55.0-aarch64-unknown-linux-gnu.tar.gz) = 390027236 bytes
+BLAKE2s (rust-1.55.0-aarch64-unknown-netbsd.tar.gz) = 034fd6c1c0c88ad8e9c6e769c3e0b9d5f9c493e994abf73cb9943510dcbf9870
+SHA512 (rust-1.55.0-aarch64-unknown-netbsd.tar.gz) = aad82847c5625893c6e4dda58cb96061df724963648f4d1f5d5953cc79c22fbccef614dc197028100e0f64dc55e92b068610860d85e13abfe35abd41a21dd5a6
+Size (rust-1.55.0-aarch64-unknown-netbsd.tar.gz) = 235786139 bytes
+BLAKE2s (rust-1.55.0-aarch64_be-unknown-netbsd.tar.gz) = 54893db0f58f2802ac29573118270ccb95d96f6b3ce447cf70f721a33fc86529
+SHA512 (rust-1.55.0-aarch64_be-unknown-netbsd.tar.gz) = bf0597cf3d3c58e72c38b159c8192ea354b8ada1dc3e539d193414bda3b7eff2a33ed998d75d9fac8db86ed1e6427f6b1da562b833bd3657fc707271e6e71226
+Size (rust-1.55.0-aarch64_be-unknown-netbsd.tar.gz) = 239876743 bytes
+BLAKE2s (rust-1.55.0-arm-unknown-linux-gnueabihf.tar.gz) = 8d19b2256a6e193f0e879771e1bccceaa8986bee3b483faeece02a82ae848b41
+SHA512 (rust-1.55.0-arm-unknown-linux-gnueabihf.tar.gz) = cb5c5103340f0c51afd65b878691aa8dedb0068462348893c8e7aa17a62dfe488cb94b9e92e57ac6c7cc216d304c1abb7e5173d4c8b9cbe069f35a7ea8378b47
+Size (rust-1.55.0-arm-unknown-linux-gnueabihf.tar.gz) = 330830841 bytes
+BLAKE2s (rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.gz) = ddab2c264edbf9ccc6f49cba22bb0451bdfedd3332e026a85eb4691661755a55
+SHA512 (rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.gz) = 1d1d9441591c00075349728bf096fc40b3343b7f2449b30f11330d9654f209f34abaaf7da6dd232bbbbdcbb7657f593157ef9746747900dd8956b91f1031ef3a
+Size (rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.gz) = 320517092 bytes
+BLAKE2s (rust-1.55.0-armv7-unknown-netbsd-eabihf.tar.gz) = 654aef2bd4cd75b5b7cf901ed9b6395a94cffb9a11e665e3789a839c55e61690
+SHA512 (rust-1.55.0-armv7-unknown-netbsd-eabihf.tar.gz) = 5ca14861e7ba965f07be7c4238feaf6e7fd89432176223ec7c0cea0502834983966956f0927ab767a50df70947a65d87c6f5f2e0449841b781be01cf5cb79444
+Size (rust-1.55.0-armv7-unknown-netbsd-eabihf.tar.gz) = 203462890 bytes
+BLAKE2s (rust-1.55.0-i586-unknown-netbsd.tar.gz) = 5e4242042cdafc465e9436aacd1f2b388c93a350941eecccfb0bcca3e0eed13e
+SHA512 (rust-1.55.0-i586-unknown-netbsd.tar.gz) = 4062622db0de5d5dcf044c2c4f07304650e129e4c88e29632c3f1b89a239e0bb5ac00248a23e1e0fe03cdbc09515bce20ca2fbfad8bc579c1d57a91ab5feec39
+Size (rust-1.55.0-i586-unknown-netbsd.tar.gz) = 244837128 bytes
+BLAKE2s (rust-1.55.0-i686-unknown-linux-gnu.tar.gz) = 341f312b8948c845df6d065d793d3069f6160323d1dc5b733ebfeeabeece59cb
+SHA512 (rust-1.55.0-i686-unknown-linux-gnu.tar.gz) = 89810a9e316335e15f9c9aee1b13d57207d0d96395607d4ddb54ebe0b587af27e7293270d869dfcc7a7668e2365753ab056c7a8308c8e7c5c4a93a50263980b0
+Size (rust-1.55.0-i686-unknown-linux-gnu.tar.gz) = 369971910 bytes
+BLAKE2s (rust-1.55.0-powerpc-unknown-netbsd.tar.gz) = 69f33c62dde61b46ffe3b0fbbd87c3b64301baa40d322267eace925d82f519ec
+SHA512 (rust-1.55.0-powerpc-unknown-netbsd.tar.gz) = b3147e71ca390d1c95a9499ade9601c52f62af6931571a5520701924fd569a6227eb74cfacc2284c3dca24f2df09e36f30dc379538d02cc04b550e1827563d7b
+Size (rust-1.55.0-powerpc-unknown-netbsd.tar.gz) = 264279133 bytes
+BLAKE2s (rust-1.55.0-powerpc-unknown-netbsd90.tar.gz) = e1fb09b14e7490bf0e570c8837000a9bef591d0c76ec70b8250c42ab54ea3acd
+SHA512 (rust-1.55.0-powerpc-unknown-netbsd90.tar.gz) = d113f1802968ce7a9bb9523ce0e8601a59968430a68c209de1c38612210dd6f99079ab095a4af13a90bc5e11b602a607d92714c5c9ad5a96eb6c8f2e6b0d0065
+Size (rust-1.55.0-powerpc-unknown-netbsd90.tar.gz) = 269606244 bytes
+BLAKE2s (rust-1.55.0-sparc64-unknown-netbsd.tar.gz) = 8bed7c597158211275ce58120702d2ef5f53bbf6205a6b1719ff3ec0331c606d
+SHA512 (rust-1.55.0-sparc64-unknown-netbsd.tar.gz) = a2b42a9a7b4ebf93a3dcb66d49871000bbf4d1781cf4fb8adb0045ea8ecb702c5fe9641ae6aa5e0065fc8aa9ad11e545b659c47e1ecb279525df0c20384969bb
+Size (rust-1.55.0-sparc64-unknown-netbsd.tar.gz) = 246304777 bytes
+BLAKE2s (rust-1.55.0-x86_64-apple-darwin.tar.gz) = f8e9977847f16fe298fc450fc26aad9e20232a170efa0d6176fb1c62ded3bc9a
+SHA512 (rust-1.55.0-x86_64-apple-darwin.tar.gz) = 243c60398163ec3c95cd57afa0786de9b2dcceaa631737ab9bc08ff732d20116d22c13168262ba9743818667f1262f29bc58273512e406a1868544b7abd5b4ef
+Size (rust-1.55.0-x86_64-apple-darwin.tar.gz) = 303469924 bytes
+BLAKE2s (rust-1.55.0-x86_64-unknown-freebsd.tar.gz) = ca207a6f3de308a267a41e24a334d995432fa508f739c45e7bac39a6d76ccbb9
+SHA512 (rust-1.55.0-x86_64-unknown-freebsd.tar.gz) = 222d3c1d0245f1a6b589a0b1f6f1d7a0b97a6992c5cd82fde978e82dc292697f7f94e67ec3a767d06f67b13e839e42aa107183e1f02020bbba34fd4f1939323e
+Size (rust-1.55.0-x86_64-unknown-freebsd.tar.gz) = 292309323 bytes
+BLAKE2s (rust-1.55.0-x86_64-unknown-illumos.tar.gz) = 50073fa3f49e8e4f4d8992b856b8c0f171c4731b9d43ab78e575428e3efa9c57
+SHA512 (rust-1.55.0-x86_64-unknown-illumos.tar.gz) = 5db1aee31e68651e4d43f515875344253bba051caa935b9474e3ad510a1c0e14bc7acd32367746fd7176853543374412c56b22283f8591d6d29dffb5234c7264
+Size (rust-1.55.0-x86_64-unknown-illumos.tar.gz) = 176824538 bytes
+BLAKE2s (rust-1.55.0-x86_64-unknown-linux-gnu.tar.gz) = 7f74d063b83b83c92f6dcb3d53b2b6fd792666f37dca8aff3ede636de8e2bc12
+SHA512 (rust-1.55.0-x86_64-unknown-linux-gnu.tar.gz) = b8f8ab868c4ba1d653d98546fb0b4c96f3f4ab929fa9fe20c847ed625801afe20c24444f868275e4eb3494509e70a81a75fc336018086d12c24a25b63af8021b
+Size (rust-1.55.0-x86_64-unknown-linux-gnu.tar.gz) = 240677382 bytes
+BLAKE2s (rust-1.55.0-x86_64-unknown-netbsd.tar.gz) = 83868def7ffe1647bea6dfccd46e352b075ddf7c9222091126c703b3b3ad2aba
+SHA512 (rust-1.55.0-x86_64-unknown-netbsd.tar.gz) = 43063d2eceacb972278c3de95407d4e7e21729c6f93c832b8ac21d836be9d8bca48d9a1ca2e7f299214a489736e0ee0aeea1db286b521c973980462234536f09
+Size (rust-1.55.0-x86_64-unknown-netbsd.tar.gz) = 247956887 bytes
+BLAKE2s (rust-std-1.55.0-aarch64-apple-darwin.tar.gz) = 76a1d5404a1f26c14920e8bda817478ad226ebddd602b32346a382b3ae41d775
+SHA512 (rust-std-1.55.0-aarch64-apple-darwin.tar.gz) = 5c47ea7729623585b25eb72d8acd8f1ec130f87c8534afd2592d208fd0bb74240f8eba735033beec9b6793cc3e47143a668f4deb90ec3ac957041d966fc2cd17
+Size (rust-std-1.55.0-aarch64-apple-darwin.tar.gz) = 32289409 bytes
+BLAKE2s (rust-std-1.55.0-aarch64-unknown-linux-gnu.tar.gz) = 650592237e223363fa1f551ded129bc185b91719a907c1d854196cab3d43c723
+SHA512 (rust-std-1.55.0-aarch64-unknown-linux-gnu.tar.gz) = c31a3a9cc3cf76f9b47fd84733e8b32353e0a9edfd6114a593168fd57b742d908faacaa5251742955f0eff2a7976f3ba0ad4676d3d2d729087b923ded029c477
+Size (rust-std-1.55.0-aarch64-unknown-linux-gnu.tar.gz) = 47115028 bytes
+BLAKE2s (rust-std-1.55.0-aarch64-unknown-netbsd.tar.gz) = 532999c86380090d32a04a79570849d96b6f7b17b1f257bcbe4d1005a396082a
+SHA512 (rust-std-1.55.0-aarch64-unknown-netbsd.tar.gz) = 11644af9968198c79067b1acc69faf3f786db4d9cdf61d862ce3c34e240d9cc9a8a13b1f03813fd05032b644be847a988ab7329876d0681286e04d2317442774
+Size (rust-std-1.55.0-aarch64-unknown-netbsd.tar.gz) = 27826449 bytes
+BLAKE2s (rust-std-1.55.0-aarch64_be-unknown-netbsd.tar.gz) = 16c2a22904d1ac7063382d20a98d6ed2a478fbbc7da27f0e02d5647c3afe3dcd
+SHA512 (rust-std-1.55.0-aarch64_be-unknown-netbsd.tar.gz) = 1650d6e4edc5b3de4903364840bf0a52d7e689435a91235ab6ed2a431c8efa6ea011e293e8697b296434482c5d0d39c52daf9b8efcc2cb493e45880fc4ad08c7
+Size (rust-std-1.55.0-aarch64_be-unknown-netbsd.tar.gz) = 27813937 bytes
+BLAKE2s (rust-std-1.55.0-arm-unknown-linux-gnueabihf.tar.gz) = ca71feb74773dbb178a56b84c3ed46fd2de32444227b105e4402536a43a01e9d
+SHA512 (rust-std-1.55.0-arm-unknown-linux-gnueabihf.tar.gz) = c2184bac3844b0541361978013402bc94b44b056a7072e7ba84f61df835ba86e564206300860f9ebb732354448db5f74f915264f3f16a80f824e548ef6afaf89
+Size (rust-std-1.55.0-arm-unknown-linux-gnueabihf.tar.gz) = 29649439 bytes
+BLAKE2s (rust-std-1.55.0-armv7-unknown-linux-gnueabihf.tar.gz) = 7a73112d1fc9b6dd5af8e82f4849edf9e45e9edb6d58ac9b1868b7bb3a52f2fb
+SHA512 (rust-std-1.55.0-armv7-unknown-linux-gnueabihf.tar.gz) = 4596398f0fad7fd18080bb08bd87deb49c9821e8e03189ab2222fa3894a6d95ef1686b38e861cf11d6f21df2dad019f2a197cb83bb183296c045884cc0980f2a
+Size (rust-std-1.55.0-armv7-unknown-linux-gnueabihf.tar.gz) = 30674372 bytes
+BLAKE2s (rust-std-1.55.0-armv7-unknown-netbsd-eabihf.tar.gz) = ab640ba521d8fa54f321772c61515b9578cc57033db142736bfea5834a9f2612
+SHA512 (rust-std-1.55.0-armv7-unknown-netbsd-eabihf.tar.gz) = e0a350eafa7104328dc9dbacf30704174b2a6da0070dd70247c1313f63108fb014ad110559dbfa25a56bd96949f2585eef7eb745649febfe79c400d6a335bc73
+Size (rust-std-1.55.0-armv7-unknown-netbsd-eabihf.tar.gz) = 26920607 bytes
+BLAKE2s (rust-std-1.55.0-i586-unknown-netbsd.tar.gz) = e0b120d121ee208dc0afef9ead602399b87750c04b7a56a9c0762cb615df1ec4
+SHA512 (rust-std-1.55.0-i586-unknown-netbsd.tar.gz) = 04f76b3634f0a33fb4e8c181f399c850f507ada095b6b7c3779efcdd170ccbf4b1fb23e7c3b2c0d877c3dac6a543813aa74c3adcc63d43dcc43a382c26879104
+Size (rust-std-1.55.0-i586-unknown-netbsd.tar.gz) = 29443530 bytes
+BLAKE2s (rust-std-1.55.0-i686-unknown-linux-gnu.tar.gz) = 3cedd942743667ac7473ee774771296b7bb9b99cfec10395b8bc371a90f0841b
+SHA512 (rust-std-1.55.0-i686-unknown-linux-gnu.tar.gz) = e621cfb96adb823ef6412a1a3b666f31aced8d67b402db31cedab6ad8a5c0a35467c92fddaaa395f7fc5048ea755f696cb5b2ef357d86beb9d1496bf4d59f2fb
+Size (rust-std-1.55.0-i686-unknown-linux-gnu.tar.gz) = 33101407 bytes
+BLAKE2s (rust-std-1.55.0-powerpc-unknown-netbsd.tar.gz) = c3e8ad8a254f98ccc0a29ddfa09c5c4ed45dbcaa6bf3b5881e5678d23ca9acc3
+SHA512 (rust-std-1.55.0-powerpc-unknown-netbsd.tar.gz) = f7e7d5a8008020efe2af0f20d2b8a864a901b62921e0afed91c8c50ff7f2cbb6ecc70cde74cf92e45d9b9b71c7597bf6a3458ca7b8edfc79ffea476e2c6d59eb
+Size (rust-std-1.55.0-powerpc-unknown-netbsd.tar.gz) = 25702306 bytes
+BLAKE2s (rust-std-1.55.0-powerpc-unknown-netbsd90.tar.gz) = eeca5168b054efab942a779b4e0a154e8986d33128af1246d1eff74335a62c2d
+SHA512 (rust-std-1.55.0-powerpc-unknown-netbsd90.tar.gz) = f27fe5af0eb18f27335f6d49712552603cdd479baf6432e71cbce04009f0298418265290b278c5770f9a94639beba1ead4ff28912bbdb58a4e6b48eb6bdb70fd
+Size (rust-std-1.55.0-powerpc-unknown-netbsd90.tar.gz) = 25698927 bytes
+BLAKE2s (rust-std-1.55.0-sparc64-unknown-netbsd.tar.gz) = 91cd3444a2db44fa4e4fb569e9290a7e7b50ec289c17540cc59ccbe27e9106f4
+SHA512 (rust-std-1.55.0-sparc64-unknown-netbsd.tar.gz) = e336df60a4e40b64d7a5dac6807532f97725b2b71497c0facadb32a6bdf1e260fdbb236b47e1bc189cff696311542039d0616616336c10bc72ecb98d8c5c4a3c
+Size (rust-std-1.55.0-sparc64-unknown-netbsd.tar.gz) = 25912444 bytes
+BLAKE2s (rust-std-1.55.0-x86_64-apple-darwin.tar.gz) = 469239e37b39a52c6b8f87118d34e2779d1583e6b26d7e07056ba71b9d664902
+SHA512 (rust-std-1.55.0-x86_64-apple-darwin.tar.gz) = 1aedd8fcbfde7bb7b5e1fea6e89c097686a048516bcd43f712e25c1667be24de91237402f065eef60667bf37edc805b2c392fc54a864c32235a7154bd2a68ee6
+Size (rust-std-1.55.0-x86_64-apple-darwin.tar.gz) = 33794732 bytes
+BLAKE2s (rust-std-1.55.0-x86_64-unknown-freebsd.tar.gz) = 8764b8b1f1a686f676e4c97350abb0f8db87eb605cc622b78d944e7608557e2d
+SHA512 (rust-std-1.55.0-x86_64-unknown-freebsd.tar.gz) = 6cd4a12f6f93f92a44b99779b0e466342c828d83ac709af256ecf984d7ecec446f4ba77387c54dac1526dd02711b07d1dd766787e40de21c08666c8b28c2236e
+Size (rust-std-1.55.0-x86_64-unknown-freebsd.tar.gz) = 35347317 bytes
+BLAKE2s (rust-std-1.55.0-x86_64-unknown-linux-gnu.tar.gz) = cc8b4a0ba2c0a204b033a68f422e8bc5ab32962204d01f48ec2af0016d2f92e8
+SHA512 (rust-std-1.55.0-x86_64-unknown-linux-gnu.tar.gz) = 7e1e2c610b7ae3520a7b16a970f96292b3241c4115c133c050c559169b2ab2abb93f763792420f80a8a5f0f689cf562e5a349c809086b5e73734601586b66aff
+Size (rust-std-1.55.0-x86_64-unknown-linux-gnu.tar.gz) = 36846151 bytes
+BLAKE2s (rust-std-1.55.0-x86_64-unknown-netbsd.tar.gz) = 970e747500279b508cf87bcf96e0a10fa67c6eb52fc3dfab5526cbdcbf9bc6f3
+SHA512 (rust-std-1.55.0-x86_64-unknown-netbsd.tar.gz) = d6a2988c65139f11e6e9eb8c9fa5995fd10c7ef22c5caaad6f31ca4c7e6ef873679984346e8ffeed9e279f9079b2319b14835630f9f0b8d725e3f35b9ef5c275
+Size (rust-std-1.55.0-x86_64-unknown-netbsd.tar.gz) = 32813692 bytes
+BLAKE2s (rustc-1.56.1-src.tar.gz) = 73705e205c841547fa3549070c7b76ab70c7c95db121124eafed21819e5672d4
+SHA512 (rustc-1.56.1-src.tar.gz) = 0bd2980ae7cca126c6f045905100550c056a1c1cb91e0b79efab85f3f134f34ee9d286c51328976192799d44ff4323640c828bb984c59b332eaf861feb8ea722
+Size (rustc-1.56.1-src.tar.gz) = 179961977 bytes
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f8794cc7abaa84804731308b9011fb6b8c143a33
 SHA1 (patch-compiler_rustc__llvm_build.rs) = b5157022f0f1942ae2db1ab78145af1526780b18
-SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = d7cf546dc82bb851c94733b0c2dae988393503b3
+SHA1 (patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = acad7e2b0bbeb85f6453aeee74a0f2ca253d6a9b
 SHA1 (patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs) = efae710b37c089702802c3d5aa678d1cc5f88cc2
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = 6edc875ba9ffbc1a86b30c679eb1110ba3c6c709
-SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = b9dba8ac7dd08b906f64955ec78025166bdc911c
-SHA1 (patch-compiler_rustc__target_src_spec_solaris__base.rs) = fd5929e0e0be5dd3d44dd58e9bee57126bc6320f
-SHA1 (patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure) = 5dc1cfc843894156b513c86453db5032917a5529
+SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 18e3cb9f32c4170679459b2c63c856abe0fac6a3
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = 927b03f3f34bd21a81bd2a8b6bcf30fe241e2d32
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = f3af869fba5bc0ab8d28042f55fe830f93b8ef54
 SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8
 SHA1 (patch-src_bootstrap_bootstrap.py) = ca87e6c58f34835b420a63a18ca95605a18657c6
-SHA1 (patch-src_bootstrap_builder.rs) = d075aacb6b51b4786e66fed14aa8727106ade201
-SHA1 (patch-src_bootstrap_compile.rs) = 86fe55d04f7a8c5ec05dbdcb0fe5a0d6c07584d5
-SHA1 (patch-src_bootstrap_lib.rs) = 3277f2be69a269ac761a2a6ab4d5389d121e6ca6
+SHA1 (patch-src_bootstrap_builder.rs) = 80e4919280b26911a78e344af41d53bdf56ef682
+SHA1 (patch-src_bootstrap_compile.rs) = b919c1551494d1cd7cf0e7ef55561ba13d4e5004
+SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 23c0f170cf328b3e15bc2c520f5a16af75247ea7
-SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 77a2a9e4d324885d6fa5e68cf15ef84db0a2483b
+SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 67de0d9fc105ef7ea7a0d96fa25fc779c2b89024
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
 SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6
 SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2675b93a1d636b297a3e1e84b915a15a3da67939
 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80
 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c
-SHA1 (patch-src_tools_miri_cargo-miri_bin.rs) = 03b3df729056b61bd627857ebf6cda68b7db42c8
 SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7
 SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = ca769db07986ded26d92957e1055961895def546
 SHA1 (patch-vendor_cc_src_lib.rs) = ade35f1edfd251d9439e3ac3d79bca03b5a7ab9c
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b
 SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
-SHA1 (patch-vendor_net2_src_ext.rs) = 5c34f3eaaa0589eefe14d374d34fadd4900565fd
-SHA1 (patch-vendor_openssl-src_src_lib.rs) = b294362558958874f435a6b75226114c4eb4102b
+SHA1 (patch-vendor_openssl-src_src_lib.rs) = e62697daa7e7fa3d7b89f338c3a26066b93d7b34
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs) = 6abed2c934b546f9b92504e3db49f9bd63aa19f8
 SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3
diff --git a/lang/rust/options.mk b/lang/rust/options.mk
index 5b71b3143a3d..bd96ac328e71 100644
--- a/lang/rust/options.mk
+++ b/lang/rust/options.mk
@@ -1,19 +1,17 @@
-# $NetBSD: options.mk,v 1.16 2021/07/17 13:16:38 jperkin Exp $
+# $NetBSD: options.mk,v 1.17 2021/11/20 16:09:46 he Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rust
-PKG_SUPPORTED_OPTIONS+=	rust-cargo-static
-PKG_SUPPORTED_OPTIONS+=	rust-llvm
+PKG_SUPPORTED_OPTIONS+=	rust-cargo-static rust-docs
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+# The bundled LLVM current has issues building on SunOS.
+.if ${OPSYS} != "SunOS"
+PKG_SUPPORTED_OPTIONS+=		rust-llvm
 # There may be compatibility issues with base LLVM.
-.if !empty(HAVE_LLVM)
-PKG_SUGGESTED_OPTIONS+=	rust-llvm
-.endif
-
-# macOS/arm64 currently cannot used shared llvm
-.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
-PKG_SUGGESTED_OPTIONS+=	rust-llvm
+.  if !empty(HAVE_LLVM)
+PKG_SUGGESTED_OPTIONS+=		rust-llvm
+.  endif
 .endif
 
 # Bundle OpenSSL and curl into the cargo binary when producing
@@ -48,3 +46,12 @@ BUILDLINK_API_DEPENDS.curl+= 	curl>=7.67.0
 .include "../../www/curl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .endif
+
+#
+# Install documentation.
+#
+.if !empty(PKG_OPTIONS:Mrust-docs)
+CONFIGURE_ARGS+=	--enable-docs
+.else
+CONFIGURE_ARGS+=	--disable-docs
+.endif
diff --git a/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
index f7faf63855b3..f9fce1f76010 100644
--- a/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
+++ b/lang/rust/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.2 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.3 2021/11/20 16:09:46 he Exp $
 
 Do not use @rpath on Darwin.
 
---- compiler/rustc_codegen_ssa/src/back/linker.rs.orig	2021-02-10 17:36:44.000000000 +0000
+--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ compiler/rustc_codegen_ssa/src/back/linker.rs
-@@ -242,7 +242,7 @@ impl<'a> GccLinker<'a> {
+@@ -303,7 +303,7 @@ impl<'a> GccLinker<'a> {
              // the right `-Wl,-install_name` with an `@rpath` in it.
              if self.sess.opts.cg.rpath || self.sess.opts.debugging_opts.osx_rpath_install_name {
                  self.linker_arg("-install_name");
diff --git a/lang/rust/patches/patch-compiler_rustc__llvm_build.rs b/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
index f11699f6b361..b002f23d6e56 100644
--- a/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
+++ b/lang/rust/patches/patch-compiler_rustc__llvm_build.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.3 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.4 2021/11/20 16:09:46 he Exp $
 
 Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
index 9ddf7e46faa6..ef11ba8ee0b0 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
@@ -1,18 +1,14 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.2 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.3 2021/11/20 16:09:46 he Exp $
 
 Add aarch64_be NetBSD target.
 
---- compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs.orig	2021-04-25 17:12:53.986628780 +0200
-+++ compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs	2021-04-25 18:00:57.795577197 +0200
-@@ -0,0 +1,20 @@
+--- compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs.orig	2021-09-10 09:47:35.334562996 +0000
++++ compiler/rustc_target/src/spec/aarch64_be_unknown_netbsd.rs
+@@ -0,0 +1,17 @@
 +use crate::abi::Endian;
 +use crate::spec::{Target, TargetOptions};
 +
 +pub fn target() -> Target {
-+    let mut base = super::netbsd_base::opts();
-+    base.max_atomic_width = Some(128);
-+    base.unsupported_abis = super::arm_base::unsupported_abis();
-+
 +    Target {
 +        llvm_target: "aarch64_be-unknown-netbsd".to_string(),
 +        pointer_width: 64,
@@ -20,8 +16,9 @@ Add aarch64_be NetBSD target.
 +        arch: "aarch64".to_string(),
 +        options: TargetOptions {
 +            mcount: "__mcount".to_string(),
++            max_atomic_width: Some(128),
 +            endian: Endian::Big,
-+            ..base
++            ..super::netbsd_base::opts()
 +        },
 +    }
 +}
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs
index ecd21b175455..00e2627e69b3 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_i586__unknown__netbsd.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Add an i586 / pentium variant, in an effort to support AMD Geode etc.
 
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
index a5f24b22af32..5703d1f17ed3 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Add i586(pentium) and aarch64_be targets.
 
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
index 27667d69b1b0..4d3b6c05ddc5 100644
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
+++ b/lang/rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
@@ -1,9 +1,9 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_netbsd__base.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-compiler_rustc__target_src_spec_netbsd__base.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 For the benefit of powerpc, when libatomic-links is installed,
 search the directory containing the symlinks to -latomic.
 
---- compiler/rustc_target/src/spec/netbsd_base.rs.orig	2021-07-26 14:43:01.000000000 +0000
+--- compiler/rustc_target/src/spec/netbsd_base.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ compiler/rustc_target/src/spec/netbsd_base.rs
 @@ -1,6 +1,14 @@
 -use crate::spec::{RelroLevel, TargetOptions};
diff --git a/lang/rust/patches/patch-compiler_rustc__target_src_spec_solaris__base.rs b/lang/rust/patches/patch-compiler_rustc__target_src_spec_solaris__base.rs
deleted file mode 100644
index 370d20fd9246..000000000000
--- a/lang/rust/patches/patch-compiler_rustc__target_src_spec_solaris__base.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-compiler_rustc__target_src_spec_solaris__base.rs,v 1.3 2021/09/10 15:09:32 jperkin Exp $
-
-Enable frame pointers on SunOS.
-
---- compiler/rustc_target/src/spec/solaris_base.rs.orig	2021-07-26 14:43:01.000000000 +0000
-+++ compiler/rustc_target/src/spec/solaris_base.rs
-@@ -9,6 +9,7 @@ pub fn opts() -> TargetOptions {
-         families: vec!["unix".to_string()],
-         is_like_solaris: true,
-         linker_is_gnu: false,
-+        eliminate_frame_pointer: false,
-         limit_rdylib_exports: false, // Linker doesn't support this
-         eh_frame_header: false,
- 
diff --git a/lang/rust/patches/patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure b/lang/rust/patches/patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure
deleted file mode 100644
index c5e0bcda756d..000000000000
--- a/lang/rust/patches/patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure,v 1.2 2021/09/10 15:09:32 jperkin Exp $
-
-Use pkgsrc libtool.
-
---- library/backtrace/crates/backtrace-sys/src/libbacktrace/configure.orig	2020-10-07 08:04:03.000000000 +0000
-+++ library/backtrace/crates/backtrace-sys/src/libbacktrace/configure
-@@ -7916,7 +7916,7 @@ fi
- LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='libtool'
- 
- 
- 
diff --git a/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs b/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs
index cbe99f93094c..3f6752c7f5ca 100644
--- a/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs
+++ b/lang/rust/patches/patch-library_std_src_sys_unix_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-library_std_src_sys_unix_mod.rs,v 1.2 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-library_std_src_sys_unix_mod.rs,v 1.3 2021/11/20 16:09:46 he Exp $
 
 Add libexecinfo for backtrace() on NetBSD.
 
diff --git a/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs b/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
index fec27ffbb9e2..699cef0d9d29 100644
--- a/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
+++ b/lang/rust/patches/patch-library_std_src_sys_unix_thread.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-library_std_src_sys_unix_thread.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Fix stack-clash on SunOS.
 
diff --git a/lang/rust/patches/patch-library_unwind_build.rs b/lang/rust/patches/patch-library_unwind_build.rs
index f3eb6a292ed8..87bb35260319 100644
--- a/lang/rust/patches/patch-library_unwind_build.rs
+++ b/lang/rust/patches/patch-library_unwind_build.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-library_unwind_build.rs,v 1.5 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-library_unwind_build.rs,v 1.6 2021/11/20 16:09:46 he Exp $
 
 Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
diff --git a/lang/rust/patches/patch-src_bootstrap_bootstrap.py b/lang/rust/patches/patch-src_bootstrap_bootstrap.py
index 88c4b43d6ad3..00dcc257a9a8 100644
--- a/lang/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/lang/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.7 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.8 2021/11/20 16:09:46 he Exp $
 
 Use `uname -p` on NetBSD, as that is reliable and sensible there.
 Do not use debuginfo; optimize 'bootstrap' instead.
diff --git a/lang/rust/patches/patch-src_bootstrap_builder.rs b/lang/rust/patches/patch-src_bootstrap_builder.rs
index 1be98d5b5ec4..8955c0921403 100644
--- a/lang/rust/patches/patch-src_bootstrap_builder.rs
+++ b/lang/rust/patches/patch-src_bootstrap_builder.rs
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_bootstrap_builder.rs,v 1.17 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_bootstrap_builder.rs,v 1.18 2021/11/20 16:09:46 he Exp $
 
 Do not install 'src'.
 Use @PREFIX@, not $ORIGIN in rpath.
 
 Fix RPATH for pkgsrc.
 
---- src/bootstrap/builder.rs.orig	2021-05-03 20:57:16.000000000 +0000
+--- src/bootstrap/builder.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ src/bootstrap/builder.rs
-@@ -484,7 +484,6 @@ impl<'a> Builder<'a> {
+@@ -511,7 +511,6 @@ impl<'a> Builder<'a> {
                  install::Clippy,
                  install::Miri,
                  install::Analysis,
@@ -15,7 +15,7 @@ Fix RPATH for pkgsrc.
                  install::Rustc
              ),
              Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest),
-@@ -1106,7 +1105,7 @@ impl<'a> Builder<'a> {
+@@ -1148,7 +1147,7 @@ impl<'a> Builder<'a> {
                  rustflags.arg("-Zosx-rpath-install-name");
                  Some("-Wl,-rpath,@loader_path/../lib")
              } else if !target.contains("windows") {
diff --git a/lang/rust/patches/patch-src_bootstrap_compile.rs b/lang/rust/patches/patch-src_bootstrap_compile.rs
index 4a2858730dd7..ab1670dd4f7c 100644
--- a/lang/rust/patches/patch-src_bootstrap_compile.rs
+++ b/lang/rust/patches/patch-src_bootstrap_compile.rs
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_bootstrap_compile.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_bootstrap_compile.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 On Darwin, do not use @rpath for internal libraries.
 
---- src/bootstrap/compile.rs.orig	2021-03-23 16:15:10.000000000 +0000
+--- src/bootstrap/compile.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ src/bootstrap/compile.rs
-@@ -360,7 +360,7 @@ fn copy_sanitizers(
+@@ -394,7 +394,7 @@ fn copy_sanitizers(
  
          if target == "x86_64-apple-darwin" || target == "aarch64-apple-darwin" {
              // Update the library’s install name to reflect that it has has been renamed.
diff --git a/lang/rust/patches/patch-src_bootstrap_lib.rs b/lang/rust/patches/patch-src_bootstrap_lib.rs
index eb8a1e86fb8c..6745a670cb5b 100644
--- a/lang/rust/patches/patch-src_bootstrap_lib.rs
+++ b/lang/rust/patches/patch-src_bootstrap_lib.rs
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_bootstrap_lib.rs,v 1.10 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_bootstrap_lib.rs,v 1.11 2021/11/20 16:09:46 he Exp $
 
 Don't filter out optimization flags.
 FreeBSD has a particular C++ runtime library name
 
---- src/bootstrap/lib.rs.orig	2020-03-09 22:11:17.000000000 +0000
+--- src/bootstrap/lib.rs.orig	2021-09-06 18:42:35.000000000 +0000
 +++ src/bootstrap/lib.rs
-@@ -759,7 +759,6 @@ impl Build {
+@@ -954,14 +954,13 @@ impl Build {
              .args()
              .iter()
              .map(|s| s.to_string_lossy().into_owned())
@@ -13,15 +13,11 @@ FreeBSD has a particular C++ runtime library name
              .collect::<Vec<String>>();
  
          // If we're compiling on macOS then we add a few unconditional flags
-@@ -770,6 +769,11 @@ impl Build {
+         // indicating that we want libc++ (more filled out than libstdc++) and
+         // we want to compile for 10.7. This way we can ensure that
+         // LLVM/etc are all properly compiled.
+-        if target.contains("apple-darwin") {
++        if target.contains("apple-darwin") || target.contains("freebsd") {
              base.push("-stdlib=libc++".into());
          }
  
-+        // FreeBSD (from 10.2) also uses libc++.
-+        if target.contains("freebsd") {
-+            base.push("-stdlib=libc++".into());
-+        }
-+
-         // Work around an apparently bad MinGW / GCC optimization,
-         // See: http://lists.llvm.org/pipermail/cfe-dev/2016-December/051980.html
-         // See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78936
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index 843dbb698f0d..4dc947f2312b 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.5 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.6 2021/11/20 16:09:46 he Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake b/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
index 716c89a25441..1ec52d45b1e3 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -1,16 +1,15 @@
-$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.6 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.7 2021/11/20 16:09:46 he Exp $
 
-"-z discard-unused" is only supported by Oracle Solaris ld.
 On Darwin, use correct install-name for shared libraries.
 
 --- src/llvm-project/llvm/cmake/modules/AddLLVM.cmake.orig	2020-09-22 17:14:20.000000000 +0000
 +++ src/llvm-project/llvm/cmake/modules/AddLLVM.cmake
-@@ -2063,7 +2063,7 @@ function(llvm_setup_rpath name)
+@@ -2117,7 +2117,7 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)
 -    set(_install_name_dir INSTALL_NAME_DIR "@rpath")
 +    set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
      set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
-   elseif(UNIX)
-     set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
+   elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
+     # $ORIGIN is not interpreted at link time by aix ld.
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
index 48cbc26ba4dc..246d557f1fc1 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.3 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.4 2021/11/20 16:09:46 he Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
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
index b62f54331d1c..91a1a2c6e242 100644
--- 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
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
 
diff --git a/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp b/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
index e488d27b31a8..1d2070cd7a7f 100644
--- a/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
+++ b/lang/rust/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.5 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.6 2021/11/20 16:09:46 he Exp $
 
 Avoid ambiguous function call.
 
diff --git a/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs b/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
index 8544c2ab17ec..bea2ac301212 100644
--- a/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
+++ b/lang/rust/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.6 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.7 2021/11/20 16:09:46 he Exp $
 
 Turn off incremental builds for sparc64, ref.
 https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
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 21895f48bb53..0c871de2c1a8 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,4 +1,4 @@
-$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.8 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.9 2021/11/20 16:09:46 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/
diff --git a/lang/rust/patches/patch-src_tools_miri_cargo-miri_bin.rs b/lang/rust/patches/patch-src_tools_miri_cargo-miri_bin.rs
deleted file mode 100644
index 98e8d1b254ae..000000000000
--- a/lang/rust/patches/patch-src_tools_miri_cargo-miri_bin.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_tools_miri_cargo-miri_bin.rs,v 1.1 2021/09/10 15:09:32 jperkin Exp $
-
-https://github.com/rust-lang/miri/commit/e5b340017e39dc90e3f9cf9966244faa585321b5
-
---- src/tools/miri/cargo-miri/bin.rs.orig	2021-07-26 14:43:20.000000000 +0000
-+++ src/tools/miri/cargo-miri/bin.rs
-@@ -7,6 +7,7 @@ use std::iter::TakeWhile;
- use std::ops::Not;
- use std::path::{Path, PathBuf};
- use std::process::Command;
-+use std::fmt::{Write as _};
- 
- use serde::{Deserialize, Serialize};
- 
diff --git a/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs b/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
index c952eb807e65..1ac822e18647 100644
--- a/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
+++ b/lang/rust/patches/patch-src_tools_rls_rls_src_cmd.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_rls_rls_src_cmd.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_tools_rls_rls_src_cmd.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Use 32-bit atomic instead of 64-bit; latter may not be available on
 32-bit platforms (powerpc, earmv7).
diff --git a/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs b/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
index 67d8f63eed23..0e9a1cf57e6a 100644
--- a/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
+++ b/lang/rust/patches/patch-src_tools_rls_rls_src_server_io.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_rls_rls_src_server_io.rs,v 1.5 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_tools_rls_rls_src_server_io.rs,v 1.6 2021/11/20 16:09:46 he Exp $
 
 Use 32-bit atomic instead of 64-bit; latter may not be available on
 32-bit platforms (powerpc, earmv7).
diff --git a/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh b/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh
index 2bdc8509c668..f306055464c9 100644
--- a/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh
+++ b/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.7 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.8 2021/11/20 16:09:46 he Exp $
 
 No logging to 'install.log'.
 Do not create 'uninstall.sh'.
diff --git a/lang/rust/patches/patch-vendor_cc_src_lib.rs b/lang/rust/patches/patch-vendor_cc_src_lib.rs
index 689c4fc7d9e0..2076e2377fc8 100644
--- a/lang/rust/patches/patch-vendor_cc_src_lib.rs
+++ b/lang/rust/patches/patch-vendor_cc_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_cc_src_lib.rs,v 1.2 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_cc_src_lib.rs,v 1.3 2021/11/20 16:09:46 he Exp $
 
 Add aarch64_eb.
 
diff --git a/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs b/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
index b195f20a3b41..345bf88e49c2 100644
--- a/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
+++ b/lang/rust/patches/patch-vendor_libc_src_unix_solarish_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_libc_src_unix_solarish_mod.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Fix xattr build.
 
diff --git a/lang/rust/patches/patch-vendor_lzma-sys_config.h b/lang/rust/patches/patch-vendor_lzma-sys_config.h
index 3def4e601ec3..181e5dc28c3f 100644
--- a/lang/rust/patches/patch-vendor_lzma-sys_config.h
+++ b/lang/rust/patches/patch-vendor_lzma-sys_config.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_lzma-sys_config.h,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_lzma-sys_config.h,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Fix SunOS builds with newer compilers.
 
diff --git a/lang/rust/patches/patch-vendor_net2_src_ext.rs b/lang/rust/patches/patch-vendor_net2_src_ext.rs
deleted file mode 100644
index ad8d594db7a4..000000000000
--- a/lang/rust/patches/patch-vendor_net2_src_ext.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-vendor_net2_src_ext.rs,v 1.3 2021/01/01 20:44:48 he Exp $
-
-It looks like NetBSD doesn't need the same tweak as OpenBSD
-to use SO_KEEPALIVE instead of TCP_KEEPIDLE when specifying
-TCP-layer keepalive value.
-
---- vendor/net2/src/ext.rs.orig	2020-11-16 14:27:49.000000000 +0000
-+++ vendor/net2/src/ext.rs
-@@ -668,7 +668,7 @@ impl<T: AsRawSocket> AsSock for T {
- cfg_if! {
-     if #[cfg(any(target_os = "macos", target_os = "ios"))] {
-         use libc::TCP_KEEPALIVE as KEEPALIVE_OPTION;
--    } else if #[cfg(any(target_os = "haiku", target_os = "netbsd", target_os = "openbsd"))] {
-+    } else if #[cfg(any(target_os = "haiku", target_os = "openbsd"))] {
-         use libc::SO_KEEPALIVE as KEEPALIVE_OPTION;
-     } else if #[cfg(unix)] {
-         use libc::TCP_KEEPIDLE as KEEPALIVE_OPTION;
diff --git a/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs b/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
index 6d24c6f942ee..827b74380d02 100644
--- a/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
+++ b/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.5 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.6 2021/11/20 16:09:46 he Exp $
 
 Provide defaults for the various NetBSD targets.
 
@@ -13,7 +13,7 @@ Provide defaults for the various NetBSD targets.
              "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
              "arm-linux-androideabi" => "linux-armv4",
              "armv7-linux-androideabi" => "linux-armv4",
-@@ -232,6 +234,7 @@ impl Build {
+@@ -234,6 +236,7 @@ impl Build {
              "armv7-unknown-linux-musleabi" => "linux-armv4",
              "armv7-unknown-linux-gnueabihf" => "linux-armv4",
              "armv7-unknown-linux-musleabihf" => "linux-armv4",
@@ -21,7 +21,7 @@ Provide defaults for the various NetBSD targets.
              "asmjs-unknown-emscripten" => "gcc",
              "i586-unknown-linux-gnu" => "linux-elf",
              "i586-unknown-linux-musl" => "linux-elf",
-@@ -242,6 +245,8 @@ impl Build {
+@@ -244,6 +247,8 @@ impl Build {
              "i686-unknown-freebsd" => "BSD-x86-elf",
              "i686-unknown-linux-gnu" => "linux-elf",
              "i686-unknown-linux-musl" => "linux-elf",
@@ -30,17 +30,18 @@ Provide defaults for the various NetBSD targets.
              "mips-unknown-linux-gnu" => "linux-mips32",
              "mips-unknown-linux-musl" => "linux-mips32",
              "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -249,12 +254,14 @@ impl Build {
-             "mipsel-unknown-linux-gnu" => "linux-mips32",
+@@ -254,6 +259,7 @@ impl Build {
              "mipsel-unknown-linux-musl" => "linux-mips32",
+             "powerpc-unknown-freebsd" => "BSD-generic32",
              "powerpc-unknown-linux-gnu" => "linux-ppc",
 +            "powerpc-unknown-netbsd" => "BSD-generic32",
              "powerpc64-unknown-freebsd" => "BSD-generic64",
              "powerpc64-unknown-linux-gnu" => "linux-ppc64",
-             "powerpc64le-unknown-freebsd" => "BSD-generic64",
-             "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
+             "powerpc64-unknown-linux-musl" => "linux-ppc64",
+@@ -263,6 +269,7 @@ impl Build {
              "riscv64gc-unknown-linux-gnu" => "linux-generic64",
              "s390x-unknown-linux-gnu" => "linux64-s390x",
+             "s390x-unknown-linux-musl" => "linux64-s390x",
 +            "sparc64-unknown-netbsd" => "BSD-generic64",
              "x86_64-apple-darwin" => "darwin64-x86_64-cc",
              "x86_64-linux-android" => "linux-x86_64",
diff --git a/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
index 8f5e0f6e9219..91d2eb9253f4 100644
--- a/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
+++ b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.2 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.3 2021/11/20 16:09:46 he Exp $
 
 Add aarch64_be NetBSD target.
 
diff --git a/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs
index 0a09f1e8f3e5..268b9576b71d 100644
--- a/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs
+++ b/lang/rust/patches/patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs,v 1.2 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_mod.rs,v 1.3 2021/11/20 16:09:46 he Exp $
 
 Add aarch64_be NetBSD target.
 
diff --git a/lang/rust/patches/patch-vendor_stacker_src_lib.rs b/lang/rust/patches/patch-vendor_stacker_src_lib.rs
index 62a2eba50a45..9a854cf97334 100644
--- a/lang/rust/patches/patch-vendor_stacker_src_lib.rs
+++ b/lang/rust/patches/patch-vendor_stacker_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_stacker_src_lib.rs,v 1.4 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_stacker_src_lib.rs,v 1.5 2021/11/20 16:09:46 he Exp $
 
 Avoid missing pthread_* on older SunOS.
 
diff --git a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
index 17d3726b9cbf..81cee33c33de 100644
--- a/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
+++ b/lang/rust/patches/patch-vendor_target-lexicon_src_targets.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.3 2021/09/10 15:09:32 jperkin Exp $
+$NetBSD: patch-vendor_target-lexicon_src_targets.rs,v 1.4 2021/11/20 16:09:46 he Exp $
 
 Add aarch64_eb for NetBSD.
 
diff --git a/lang/rust/platform.mk b/lang/rust/platform.mk
index f27499bbbd83..69023b2ccc10 100644
--- a/lang/rust/platform.mk
+++ b/lang/rust/platform.mk
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.12 2021/09/10 15:09:32 jperkin Exp $
+# $NetBSD: platform.mk,v 1.13 2021/11/20 16:09:46 he Exp $
 
 # This file encodes whether a given platform has support for rust.
 
@@ -10,8 +10,6 @@
 # Rust needs NetBSD>7
 .  for rust_arch in aarch64 earmv7hf i386 powerpc sparc64 x86_64
 .    for rust_os in Darwin FreeBSD Linux NetBSD SunOS
-# rust fails to build on NetBSD/earmv7
-# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54621
 .      if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[0-7].*)
 RUST_PLATFORMS+=	${rust_os}-*-${rust_arch}
 .      endif