7 files changed, 61 insertions, 76 deletions

diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index b9c5e967755e..11816296f3bc 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
 
 CARGO_BUILDDEP?=	yes
 .  if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.69.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.70.0:lang/${RUST_DEFAULT}
 .  elif ${CARGO_BUILDDEP:tl} == "any-version"
 BUILD_DEPENDS+=	${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
 .  endif
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 4bf498139b9e..8727a390757f 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -76,7 +76,7 @@ BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
 				rust-cbindgen>=0.24.3:devel/rust-cbindgen \
-				${RUST_DEFAULT}>=1.69.0:lang/${RUST_DEFAULT} \
+				${RUST_DEFAULT}>=1.70.0:lang/${RUST_DEFAULT} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile
index e439201f9a92..2b9a27b61d24 100644
--- a/lang/rust-bootstrap/Makefile
+++ b/lang/rust-bootstrap/Makefile
@@ -2,7 +2,7 @@
 # to upload them to ~/public_distfiles on freefall in preparation
 # for the next lang/rust update.
 PORTNAME=	rust
-PORTVERSION=	1.69.0
+PORTVERSION=	1.70.0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 PKGNAMEPREFIX=	${FLAVOR:S/_/-/g}-
diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo
index 5c1cdf163c9b..5dffcd71bd61 100644
--- a/lang/rust-bootstrap/distinfo
+++ b/lang/rust-bootstrap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681906579
-SHA256 (rust/rustc-1.69.0-src.tar.xz) = e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75
-SIZE (rust/rustc-1.69.0-src.tar.xz) = 127242864
+TIMESTAMP = 1685689095
+SHA256 (rust/rustc-1.70.0-src.tar.xz) = bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639
+SIZE (rust/rustc-1.70.0-src.tar.xz) = 140736896
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 63e5e8da6720..cb262c1afffa 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rust
-PORTVERSION?=	1.69.0
-PORTREVISION?=	2
+PORTVERSION?=	1.70.0
+PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
 		https://dev-static.rust-lang.org/dist/:src \
@@ -69,8 +69,8 @@ WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown
 WASM_VARS_OFF=		_RUST_BUILD_WASM=false
 
 # See WRKSRC/src/stage0.json for the date and version values
-BOOTSTRAPS_DATE?=		2023-03-28
-RUST_BOOTSTRAP_VERSION?=	1.68.0
+BOOTSTRAPS_DATE?=		2023-04-20
+RUST_BOOTSTRAP_VERSION?=	1.69.0
 
 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
 
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 43dfb5cb171d..7d1eaa2476f9 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,51 +1,51 @@
-TIMESTAMP = 1681896780
-SHA256 (rust/rustc-1.69.0-src.tar.xz) = e533c903820b0c2ba10491b70105149d2243348f3b5e26bd7b6bdd022c7dbe75
-SIZE (rust/rustc-1.69.0-src.tar.xz) = 127242864
-SHA256 (rust/2023-03-28/rustc-1.68.0-aarch64-unknown-freebsd.tar.xz) = defc0a0a13bd4569603766450adac03f56f4c212f7f6c6182d90350437dfc195
-SIZE (rust/2023-03-28/rustc-1.68.0-aarch64-unknown-freebsd.tar.xz) = 44304376
-SHA256 (rust/2023-03-28/rust-std-1.68.0-aarch64-unknown-freebsd.tar.xz) = 49e9d827129481fc33243c024b7f37ea9a73cf0232856e6c818071c51f863665
-SIZE (rust/2023-03-28/rust-std-1.68.0-aarch64-unknown-freebsd.tar.xz) = 25462124
-SHA256 (rust/2023-03-28/cargo-1.68.0-aarch64-unknown-freebsd.tar.xz) = 4029a8df7809af6bc0a2473c723452086ff89f38d6b9fb7691a840b23fd10a68
-SIZE (rust/2023-03-28/cargo-1.68.0-aarch64-unknown-freebsd.tar.xz) = 5118208
-SHA256 (rust/2023-03-28/rustc-1.68.0-x86_64-unknown-freebsd.tar.xz) = da4b51b7287a6d355463cade18406f986a2782af60f3e0344ae7e571ddf32c9e
-SIZE (rust/2023-03-28/rustc-1.68.0-x86_64-unknown-freebsd.tar.xz) = 40283960
-SHA256 (rust/2023-03-28/rust-std-1.68.0-x86_64-unknown-freebsd.tar.xz) = 56ecf6eee5cdaf8d76820c8fe1f8f3728bccf5134d240e08c7db7d65fe37126f
-SIZE (rust/2023-03-28/rust-std-1.68.0-x86_64-unknown-freebsd.tar.xz) = 26423780
-SHA256 (rust/2023-03-28/cargo-1.68.0-x86_64-unknown-freebsd.tar.xz) = 54bf60ed460f13f0d6d4c892ccd79b2402bfc18a906476e4222c75869ce205c1
-SIZE (rust/2023-03-28/cargo-1.68.0-x86_64-unknown-freebsd.tar.xz) = 5799404
-SHA256 (rust/2023-03-28/rustc-1.68.0-armv7-unknown-freebsd.tar.xz) = f19a928e99611311060e14dd05e63e6c852ac12ed10363d5c97ddf6dabac97d8
-SIZE (rust/2023-03-28/rustc-1.68.0-armv7-unknown-freebsd.tar.xz) = 43954312
-SHA256 (rust/2023-03-28/rust-std-1.68.0-armv7-unknown-freebsd.tar.xz) = d144c52b1d0fc556ab9616831cfdcf28d91c1edbe76bc1cf710915af18c4df85
-SIZE (rust/2023-03-28/rust-std-1.68.0-armv7-unknown-freebsd.tar.xz) = 24659736
-SHA256 (rust/2023-03-28/cargo-1.68.0-armv7-unknown-freebsd.tar.xz) = f13b43e67010e889fdb5233ca3530f988bbca7e38160113d80c5fba4d192d2e0
-SIZE (rust/2023-03-28/cargo-1.68.0-armv7-unknown-freebsd.tar.xz) = 5009936
-SHA256 (rust/2023-03-28/rustc-1.68.0-i686-unknown-freebsd.tar.xz) = 0252cd8e58d4e601d8800136089bb3c920c59445a5d1f5da3f03ff4fbd6f213f
-SIZE (rust/2023-03-28/rustc-1.68.0-i686-unknown-freebsd.tar.xz) = 50107268
-SHA256 (rust/2023-03-28/rust-std-1.68.0-i686-unknown-freebsd.tar.xz) = c4dfca380d13f5cce766555bf9502ca6c97d652459c63da801cd2a47a1421a23
-SIZE (rust/2023-03-28/rust-std-1.68.0-i686-unknown-freebsd.tar.xz) = 26225872
-SHA256 (rust/2023-03-28/cargo-1.68.0-i686-unknown-freebsd.tar.xz) = c9ebcd47447fa34a6641a788a0899f1bd85792b22d6f7a53314129ba13669eb2
-SIZE (rust/2023-03-28/cargo-1.68.0-i686-unknown-freebsd.tar.xz) = 6037800
-SHA256 (rust/2023-03-28/rustc-1.68.0-powerpc-unknown-freebsd.tar.xz) = bcceeff0909e0af60b79d798bc0d905a029f5bb6a79a7138badaecb0c5221e30
-SIZE (rust/2023-03-28/rustc-1.68.0-powerpc-unknown-freebsd.tar.xz) = 48636200
-SHA256 (rust/2023-03-28/rust-std-1.68.0-powerpc-unknown-freebsd.tar.xz) = 6660b48815418ec0868ec3562061eef0b6bf9363a21107772ec5b94c6dcc5938
-SIZE (rust/2023-03-28/rust-std-1.68.0-powerpc-unknown-freebsd.tar.xz) = 23542076
-SHA256 (rust/2023-03-28/cargo-1.68.0-powerpc-unknown-freebsd.tar.xz) = 374061a62dfaebaaf99ee43ca1b9709e84bee1305b5143e124771edd53372914
-SIZE (rust/2023-03-28/cargo-1.68.0-powerpc-unknown-freebsd.tar.xz) = 5592820
-SHA256 (rust/2023-03-28/rustc-1.68.0-powerpc64-unknown-freebsd.tar.xz) = 2071bef994a0a0d69d9f79c81d1ac696733d38e610eeb7ff38881ab687e99880
-SIZE (rust/2023-03-28/rustc-1.68.0-powerpc64-unknown-freebsd.tar.xz) = 45314300
-SHA256 (rust/2023-03-28/rust-std-1.68.0-powerpc64-unknown-freebsd.tar.xz) = f89838105d9a5c352f1a027af4f90a5bcea88952cbdcb2e1595514f2473f8241
-SIZE (rust/2023-03-28/rust-std-1.68.0-powerpc64-unknown-freebsd.tar.xz) = 23964184
-SHA256 (rust/2023-03-28/cargo-1.68.0-powerpc64-unknown-freebsd.tar.xz) = d63d4ceedd78057b34175083407d05573dac5c9ab7821538c430a6f38d8f7000
-SIZE (rust/2023-03-28/cargo-1.68.0-powerpc64-unknown-freebsd.tar.xz) = 5284460
-SHA256 (rust/2023-03-28/rustc-1.68.0-powerpc64le-unknown-freebsd.tar.xz) = 4459e044311490453babcf7849add606d1bd0a9a6bdbb863ad100df378753b12
-SIZE (rust/2023-03-28/rustc-1.68.0-powerpc64le-unknown-freebsd.tar.xz) = 47295652
-SHA256 (rust/2023-03-28/rust-std-1.68.0-powerpc64le-unknown-freebsd.tar.xz) = 57451a9143f8e7f141e020dba21dcec0ab6727bf7e04c7532dfb077a2d38ca3e
-SIZE (rust/2023-03-28/rust-std-1.68.0-powerpc64le-unknown-freebsd.tar.xz) = 23826968
-SHA256 (rust/2023-03-28/cargo-1.68.0-powerpc64le-unknown-freebsd.tar.xz) = 4173224bf62adf18eda255a2b498b7cf292530872ec6642be2ca4b2fd9e4aaac
-SIZE (rust/2023-03-28/cargo-1.68.0-powerpc64le-unknown-freebsd.tar.xz) = 5591532
-SHA256 (rust/2023-03-28/rustc-1.68.0-riscv64gc-unknown-freebsd.tar.xz) = 03f7af96302619b33a83daaabbd248bd78844b0bd6b445d02b8faabcb1136ced
-SIZE (rust/2023-03-28/rustc-1.68.0-riscv64gc-unknown-freebsd.tar.xz) = 60334372
-SHA256 (rust/2023-03-28/rust-std-1.68.0-riscv64gc-unknown-freebsd.tar.xz) = e125e65ae548935ab246639486b40b535365a3fbb2bd210efe1a5914841e4d1d
-SIZE (rust/2023-03-28/rust-std-1.68.0-riscv64gc-unknown-freebsd.tar.xz) = 24002916
-SHA256 (rust/2023-03-28/cargo-1.68.0-riscv64gc-unknown-freebsd.tar.xz) = 2cab372186c2f8786ba7d5694f474deda09cb55c537af33ab13e1e69c96557bb
-SIZE (rust/2023-03-28/cargo-1.68.0-riscv64gc-unknown-freebsd.tar.xz) = 7029012
+TIMESTAMP = 1685689176
+SHA256 (rust/rustc-1.70.0-src.tar.xz) = bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843bfbaf5c34639
+SIZE (rust/rustc-1.70.0-src.tar.xz) = 140736896
+SHA256 (rust/2023-04-20/rustc-1.69.0-aarch64-unknown-freebsd.tar.xz) = 92b3f4dedcfdcda92cb1c1ebda063186419073c30d16c9b11724f853dcf97822
+SIZE (rust/2023-04-20/rustc-1.69.0-aarch64-unknown-freebsd.tar.xz) = 43631168
+SHA256 (rust/2023-04-20/rust-std-1.69.0-aarch64-unknown-freebsd.tar.xz) = 494768811a56ea575fb8f1edf28959f7bf46f1a9e27bd6c22b762dd48ce13a38
+SIZE (rust/2023-04-20/rust-std-1.69.0-aarch64-unknown-freebsd.tar.xz) = 25018204
+SHA256 (rust/2023-04-20/cargo-1.69.0-aarch64-unknown-freebsd.tar.xz) = 9cad0a1ea3373c52f9013d24d72bbc2cf0ee9242c80b08f97014c7589ee853cf
+SIZE (rust/2023-04-20/cargo-1.69.0-aarch64-unknown-freebsd.tar.xz) = 5152596
+SHA256 (rust/2023-04-20/rustc-1.69.0-x86_64-unknown-freebsd.tar.xz) = b715225e5e31965c5274358b4b54843a8ab13811cfd2feb2541e738bc4bf6151
+SIZE (rust/2023-04-20/rustc-1.69.0-x86_64-unknown-freebsd.tar.xz) = 38964604
+SHA256 (rust/2023-04-20/rust-std-1.69.0-x86_64-unknown-freebsd.tar.xz) = f8ee23f08e9f64ea267f5a8b2a1fb80abcf44af0f1dd1d240569953ca64d97aa
+SIZE (rust/2023-04-20/rust-std-1.69.0-x86_64-unknown-freebsd.tar.xz) = 25655756
+SHA256 (rust/2023-04-20/cargo-1.69.0-x86_64-unknown-freebsd.tar.xz) = f996be4105c54679c200dec2422b5492f444256d19e41c491f3d1b3fef946bbf
+SIZE (rust/2023-04-20/cargo-1.69.0-x86_64-unknown-freebsd.tar.xz) = 5838552
+SHA256 (rust/2023-04-20/rustc-1.69.0-armv7-unknown-freebsd.tar.xz) = 0f7e7f33eed4832410ccc96d94c21545a7e5c87a827a9aed07a635bfa3b11635
+SIZE (rust/2023-04-20/rustc-1.69.0-armv7-unknown-freebsd.tar.xz) = 43041632
+SHA256 (rust/2023-04-20/rust-std-1.69.0-armv7-unknown-freebsd.tar.xz) = a3e7ba0c6f8ee2e500762782fe99a8ac992ae1b47903ac2febaac084e5e62a5b
+SIZE (rust/2023-04-20/rust-std-1.69.0-armv7-unknown-freebsd.tar.xz) = 24121976
+SHA256 (rust/2023-04-20/cargo-1.69.0-armv7-unknown-freebsd.tar.xz) = 7964642abf7e0834a460d51d769905e04ed9dd55ec492a2e1644008e2f1bf4aa
+SIZE (rust/2023-04-20/cargo-1.69.0-armv7-unknown-freebsd.tar.xz) = 5039304
+SHA256 (rust/2023-04-20/rustc-1.69.0-i686-unknown-freebsd.tar.xz) = 705f95918f151d4d8b4f05b8bd410ef0c5938da690e2ad7bbd55cc1c42f42cfc
+SIZE (rust/2023-04-20/rustc-1.69.0-i686-unknown-freebsd.tar.xz) = 49395736
+SHA256 (rust/2023-04-20/rust-std-1.69.0-i686-unknown-freebsd.tar.xz) = 6275a43741edf00586e5a1d00c365fbd05c5ba1304bf7d1161f17048127d851f
+SIZE (rust/2023-04-20/rust-std-1.69.0-i686-unknown-freebsd.tar.xz) = 25436824
+SHA256 (rust/2023-04-20/cargo-1.69.0-i686-unknown-freebsd.tar.xz) = aa8147ca8519fe3b2a92878dc45ddaf39b603b5200b0f2bc56712b238b581b35
+SIZE (rust/2023-04-20/cargo-1.69.0-i686-unknown-freebsd.tar.xz) = 6077544
+SHA256 (rust/2023-04-20/rustc-1.69.0-powerpc-unknown-freebsd.tar.xz) = 0764a54c3ef73d84d3c6edf7faaf2fdb9742d02a4c5cc4f6dbde1b54460dcde2
+SIZE (rust/2023-04-20/rustc-1.69.0-powerpc-unknown-freebsd.tar.xz) = 46058648
+SHA256 (rust/2023-04-20/rust-std-1.69.0-powerpc-unknown-freebsd.tar.xz) = 3df1c1ba2651b86e5d6050939a476e5c5f04cde4c361f224b67f4a759ecae10d
+SIZE (rust/2023-04-20/rust-std-1.69.0-powerpc-unknown-freebsd.tar.xz) = 23061456
+SHA256 (rust/2023-04-20/cargo-1.69.0-powerpc-unknown-freebsd.tar.xz) = a3d1afb8e11c24f047970158e64b6ce94b2390fa765410f8bdd0f73f9b33c45f
+SIZE (rust/2023-04-20/cargo-1.69.0-powerpc-unknown-freebsd.tar.xz) = 5515820
+SHA256 (rust/2023-04-20/rustc-1.69.0-powerpc64-unknown-freebsd.tar.xz) = 9ea98ce7acd562af6fb241cb16b4ff904a86fb883ed08bd36a6e29ff956aba0a
+SIZE (rust/2023-04-20/rustc-1.69.0-powerpc64-unknown-freebsd.tar.xz) = 43909140
+SHA256 (rust/2023-04-20/rust-std-1.69.0-powerpc64-unknown-freebsd.tar.xz) = e518be4f3dde952cd7075b5b04de1aa36503e3d3674e16635731a43dc81656f6
+SIZE (rust/2023-04-20/rust-std-1.69.0-powerpc64-unknown-freebsd.tar.xz) = 23289560
+SHA256 (rust/2023-04-20/cargo-1.69.0-powerpc64-unknown-freebsd.tar.xz) = 0286ef95e8dec27153df1440d3f83bf66f5e7a57e1ddd26adc5288bf12639bd3
+SIZE (rust/2023-04-20/cargo-1.69.0-powerpc64-unknown-freebsd.tar.xz) = 5309608
+SHA256 (rust/2023-04-20/rustc-1.69.0-powerpc64le-unknown-freebsd.tar.xz) = 290cea8150670cbc2c71b3abb729be664e7dd8cbc756662187bc6cfe78554aae
+SIZE (rust/2023-04-20/rustc-1.69.0-powerpc64le-unknown-freebsd.tar.xz) = 45985568
+SHA256 (rust/2023-04-20/rust-std-1.69.0-powerpc64le-unknown-freebsd.tar.xz) = f329fe724aface21c3205a5351586927dae17e0a6ef6a86a4eee4b2d75b61e01
+SIZE (rust/2023-04-20/rust-std-1.69.0-powerpc64le-unknown-freebsd.tar.xz) = 23554456
+SHA256 (rust/2023-04-20/cargo-1.69.0-powerpc64le-unknown-freebsd.tar.xz) = 2cccfd33e51c2b2dd99b9ae21715f7568ae61761332a6d610f1e2e685b1e550f
+SIZE (rust/2023-04-20/cargo-1.69.0-powerpc64le-unknown-freebsd.tar.xz) = 5618596
+SHA256 (rust/2023-04-20/rustc-1.69.0-riscv64gc-unknown-freebsd.tar.xz) = bee372643e976e38883d119cd839701304eccf8c15cf187be390e79991b7820a
+SIZE (rust/2023-04-20/rustc-1.69.0-riscv64gc-unknown-freebsd.tar.xz) = 58605668
+SHA256 (rust/2023-04-20/rust-std-1.69.0-riscv64gc-unknown-freebsd.tar.xz) = ff121aeb7f3c7c03d2f9bab8e7439989c948c3310c60293b2a6862d318fb6f6a
+SIZE (rust/2023-04-20/rust-std-1.69.0-riscv64gc-unknown-freebsd.tar.xz) = 23467276
+SHA256 (rust/2023-04-20/cargo-1.69.0-riscv64gc-unknown-freebsd.tar.xz) = 3c235e811908a9452d5d465f6deddd610f56f40100368f1210ca8e55f966baaa
+SIZE (rust/2023-04-20/cargo-1.69.0-riscv64gc-unknown-freebsd.tar.xz) = 7059164
diff --git a/lang/rust/files/patch-src_bootstrap_native.rs b/lang/rust/files/patch-src_bootstrap_native.rs
deleted file mode 100644
index 7638edc6f734..000000000000
--- a/lang/rust/files/patch-src_bootstrap_native.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-Revert part of [1] as it causes cross build problem with lang/rust-bootstrap@powerpc
-
-[1] https://github.com/rust-lang/rust/commit/07dae5a97b64100f5abd511f1e2d5a6263a54006
-
---- src/bootstrap/native.rs.orig	2022-04-13 15:53:33.692586000 +0200
-+++ src/bootstrap/native.rs	2022-04-13 15:53:47.191939000 +0200
-@@ -318,7 +318,7 @@ impl Step for Llvm {
- 
-         // Workaround for ppc32 lld limitation
-         if target == "powerpc-unknown-freebsd" {
--            ldflags.exe.push(" -fuse-ld=bfd");
-+            cfg.define("CMAKE_EXE_LINKER_FLAGS", "-fuse-ld=bfd");
-         }
- 
-         // https://llvm.org/docs/HowToCrossCompileLLVM.html