Attachment #245645 for bug #274499

Lines 97-103 WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} Link Here

(-)b/Mk/Uses/cargo.mk (-1 / +1 lines)
97		97
98	CARGO_BUILDDEP?= yes	98	CARGO_BUILDDEP?= yes
99	. if ${CARGO_BUILDDEP:tl} == "yes"	99	. if ${CARGO_BUILDDEP:tl} == "yes"
100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT}	100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.73.0:lang/${RUST_DEFAULT}
101	. elif ${CARGO_BUILDDEP:tl} == "any-version"	101	. elif ${CARGO_BUILDDEP:tl} == "any-version"
102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}	102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
103	. endif	103	. endif

Lines 75-81 BUNDLE_LIBS= yes Link Here

(-)b/Mk/bsd.gecko.mk (-1 / +1 lines)
75		75
76	BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \	76	BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
77	rust-cbindgen>=0.24.3:devel/rust-cbindgen \	77	rust-cbindgen>=0.24.3:devel/rust-cbindgen \
78	${RUST_DEFAULT}>=1.72.0:lang/${RUST_DEFAULT} \	78	${RUST_DEFAULT}>=1.73.0:lang/${RUST_DEFAULT} \
79	node:www/node	79	node:www/node
80	LIB_DEPENDS+= libdrm.so:graphics/libdrm	80	LIB_DEPENDS+= libdrm.so:graphics/libdrm
81	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci	81	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci

Lines 2-8 Link Here

(-)b/lang/rust-bootstrap/Makefile (-1 / +1 lines)
2	# to upload them to ~/public_distfiles on freefall in preparation	2	# to upload them to ~/public_distfiles on freefall in preparation
3	# for the next lang/rust update.	3	# for the next lang/rust update.
4	PORTNAME= rust	4	PORTNAME= rust
5	PORTVERSION= 1.72.0	5	PORTVERSION= 1.73.0
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= https://static.rust-lang.org/dist/	7	MASTER_SITES= https://static.rust-lang.org/dist/
8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-	8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-

Lines 1-3 Link Here

(-)b/lang/rust-bootstrap/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1692897293	1	TIMESTAMP = 1696426328
2	SHA256 (rust/rustc-1.72.0-src.tar.xz) = d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014	2	SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
3	SIZE (rust/rustc-1.72.0-src.tar.xz) = 151630408	3	SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536




PORTNAME=	rust
PORTVERSION?=	1.73.0
PORTREVISION?=	0
CATEGORIES=	lang
MASTER_SITES=	https://static.rust-lang.org/dist/:src \

			_RUST_TARGETS+=wasm32-unknown-unknown

# See WRKSRC/src/stage0.json for the date and version values
BOOTSTRAPS_DATE?=		2023-08-24
RUST_BOOTSTRAP_VERSION?=	1.72.0

CARGO_VENDOR_DIR?=		${WRKSRC}/vendor



.include <bsd.port.pre.mk>

.ifndef NIGHTLY_DATE
PATCH_SITES=	https://github.com/rust-lang/rust/commit/
# LLVM 17 API compatibility fixes
PATCHFILES=	71958da4854176c50a8b12470b956d5c7ed11817.patch:-p1 \
		6ddf9128b2b55f9def80af57f7353d2521527c6a.patch:-p1
.endif

.if ${OPSYS} != FreeBSD
IGNORE=		is only for FreeBSD
.endif




TIMESTAMP = 1697357059
SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536
SHA256 (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = f87def3751c86536dc8c2a1ac493d2832bdfb791a31a4782d5f6d47ae384cd5b
SIZE (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = 54855264
SHA256 (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 6712823eccc77234fe914992f26c37e72e050c85dc78d81f8bcfd5a6c0177779
SIZE (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 26185760
SHA256 (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 957c3061c2d4c9bb03c74c059cdba16da5d8c1ba28ce671d762552e67fe02390
SIZE (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 8065312
SHA256 (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 7e913d82625e1fa9daaf89948d657944685be4bc3b5e136a312f9dc4230d72f2
SIZE (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 46396244
SHA256 (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = b4982586d84b8d419943083d28f3b3f3992eec99b13dbd7c0a5a8e63bfe3415f
SIZE (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = 26854796
SHA256 (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 0fd521fb5bf0e3a58210eeb242a22f24f92a94b886905f4b895bc36782a7dd78
SIZE (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 8866252
SHA256 (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = cd8dfc34e5901dd2845835c7c7978f6a5725e15a3925eaba551b49e104355d4b
SIZE (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = 55045532
SHA256 (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 519b61de0c56b11f5403a31f5198d93b2109ce7e9777df4899943c97c95c8ee0
SIZE (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 25630140
SHA256 (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 90287dcb755268a67c5959c36d21270d04685ee55878d0314998272b32738dc1
SIZE (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 7944012
SHA256 (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 103910d967b01ad2a27a886bfca8b64842be9a2b044074f58f56c6cccd2270fe
SIZE (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 61326204
SHA256 (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 1747a9d544c759b8fab05a172f90c5eabde9be4b370d564177487be56549ae52
SIZE (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 26697152
SHA256 (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = eaed4aef4ad1341ebf990fdd264fb639635bc4840221074534af74e443f45f51
SIZE (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = 9249016
SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 43f44d1fd8194921b391d5c46c30163e42742073015dcc713c34ff35a0067bb5
SIZE (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 60208348
SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = de731b713a68c6db6e2bf05a02b8fdee0969cdb80dda756c41956d9a00a3194c
SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = 24553168
SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = d266f36de042cad9dd310febad76cf8d11ac1f188e2ce751b95841d7724ae4c8
SIZE (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = 9247480
SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 333d82f18d75b3fcf9ee7afc578bd0ee09a1a1c1f8f9308d0b1c4f9159ca4d2f
SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 58536072
SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = d371b600719dc4f500d6a453d64fc713fba0a188ad6c02c72fe25e2e413468a8
SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 24770180
SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = ba4b5d2df913151e70b7d406c49163915b640f7ab6a4360ce0132e5cfa5ad891
SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 8793828
SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 44eb1bf540f146fb8fafa7585639b08592f0934e81cc95ae4bfdd7d8662da0ad
SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 60191980
SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 656950dca59bf303e40263f92694242ec62d992f08a224c600765254e6a20acc
SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 24904632
SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = a2d11bb9a49f91e3da992fd4d8b141d7221c218a7b2e07af4d1bb486ba95253f
SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 9067788
SHA256 (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = a0b184b96203a4bd99c78ff61f228f843a6bfbdb6a7c690f1424e55a78c44e41
SIZE (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 70320872
SHA256 (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24904a553337220e8b50caaec5fe0309c3ef40c58b57102e2b9ee9131c3b981c
SIZE (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24923728
SHA256 (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 52ef515ce550b58954cc71a19696e8bdeee24037273458d4115259725343bd40
SIZE (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 11394328
SHA256 (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 5a6b67dfc1218ea953421816834ffe3aa8ac1fc078dfaea4ebab121460ca5211
SIZE (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 2007
SHA256 (rust/6ddf9128b2b55f9def80af57f7353d2521527c6a.patch) = 6eaaaf6714c496b610712aa9ecbe1a1614e042323ec872fbf31a0a74c9020f29
- 
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
  |
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--
www/firefox/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 www/firefox/files/patch-rust-1.73.0




From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 10 Jul 2023 09:46:53 +0000
Subject: [PATCH] Stop using old-style `simd_shuffle`

---
 src/codegen/llvm.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
index b4c09849..bb482fac 100644
--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
 #[allow(unused_imports)] // FIXME: spurious warning?
 use crate::sealed::Simd;
 
-// Shuffle intrinsics: expanded in users' crates, therefore public.
 extern "platform-intrinsic" {
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -22,7 +16,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
 {
-    simd_shuffle2(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -32,7 +26,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
 {
-    simd_shuffle4(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -42,7 +36,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
 {
-    simd_shuffle8(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -52,7 +46,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
 {
-    simd_shuffle16(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -62,7 +56,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
 {
-    simd_shuffle32(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -72,7 +66,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
 {
-    simd_shuffle64(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 extern "platform-intrinsic" {
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
  |
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--
www/tor-browser/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 www/tor-browser/files/patch-rust-1.73.0




From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 10 Jul 2023 09:46:53 +0000
Subject: [PATCH] Stop using old-style `simd_shuffle`

---
 src/codegen/llvm.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
index b4c09849..bb482fac 100644
--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
 #[allow(unused_imports)] // FIXME: spurious warning?
 use crate::sealed::Simd;
 
-// Shuffle intrinsics: expanded in users' crates, therefore public.
 extern "platform-intrinsic" {
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -22,7 +16,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
 {
-    simd_shuffle2(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -32,7 +26,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
 {
-    simd_shuffle4(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -42,7 +36,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
 {
-    simd_shuffle8(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -52,7 +46,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
 {
-    simd_shuffle16(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -62,7 +56,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
 {
-    simd_shuffle32(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -72,7 +66,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
 {
-    simd_shuffle64(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 extern "platform-intrinsic" {
 --> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
  |
  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--
www/librewolf/files/patch-rust-1.73.0 | 83 +++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 www/librewolf/files/patch-rust-1.73.0




From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 10 Jul 2023 09:46:53 +0000
Subject: [PATCH] Stop using old-style `simd_shuffle`

---
 src/codegen/llvm.rs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
index b4c09849..bb482fac 100644
--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
 #[allow(unused_imports)] // FIXME: spurious warning?
 use crate::sealed::Simd;
 
-// Shuffle intrinsics: expanded in users' crates, therefore public.
 extern "platform-intrinsic" {
-    pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
-    pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
-    pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
-    pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
-    pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
-    pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
+    fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -22,7 +16,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
 {
-    simd_shuffle2(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -32,7 +26,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
 {
-    simd_shuffle4(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -42,7 +36,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
 {
-    simd_shuffle8(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -52,7 +46,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
 {
-    simd_shuffle16(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -62,7 +56,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
 {
-    simd_shuffle32(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 #[allow(clippy::missing_safety_doc)]
@@ -72,7 +66,7 @@ where
     T: Simd,
     <T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
 {
-    simd_shuffle64(x, y, IDX)
+    simd_shuffle(x, y, IDX)
 }
 
 extern "platform-intrinsic" {

Return to bug 274499

Lines 1-5 Link Here

(-)b/lang/rust/Makefile (-10 / +3 lines)
1	PORTNAME= rust	1	PORTNAME= rust
2	PORTVERSION?= 1.72.0	2	PORTVERSION?= 1.73.0
3	PORTREVISION?= 0	3	PORTREVISION?= 0
4	CATEGORIES= lang	4	CATEGORIES= lang
5	MASTER_SITES= https://static.rust-lang.org/dist/:src \	5	MASTER_SITES= https://static.rust-lang.org/dist/:src \
Lines 69-76 WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown Link Here
69	_RUST_TARGETS+=wasm32-unknown-unknown	69	_RUST_TARGETS+=wasm32-unknown-unknown
70		70
71	# See WRKSRC/src/stage0.json for the date and version values	71	# See WRKSRC/src/stage0.json for the date and version values
72	BOOTSTRAPS_DATE?= 2023-07-13	72	BOOTSTRAPS_DATE?= 2023-08-24
73	RUST_BOOTSTRAP_VERSION?= 1.71.0	73	RUST_BOOTSTRAP_VERSION?= 1.72.0
74		74
75	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor	75	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
76		76
Lines 96-108 _COMPONENTS+= cargo-${_PACKAGE_VERS}-${_RUST_TARGET} \ Link Here
96		96
97	.include <bsd.port.pre.mk>	97	.include <bsd.port.pre.mk>
98		98
99	.ifndef NIGHTLY_DATE
100	PATCH_SITES= https://github.com/rust-lang/rust/commit/
101	# LLVM 17 API compatibility fixes
102	PATCHFILES= 71958da4854176c50a8b12470b956d5c7ed11817.patch:-p1 \
103	6ddf9128b2b55f9def80af57f7353d2521527c6a.patch:-p1
104	.endif
105
106	.if ${OPSYS} != FreeBSD	99	.if ${OPSYS} != FreeBSD
107	IGNORE= is only for FreeBSD	100	IGNORE= is only for FreeBSD
108	.endif	101	.endif

Lines 1-54 Link Here

(-)b/lang/rust/distinfo (-53 / +51 lines)
1	TIMESTAMP = 1692897225	1	TIMESTAMP = 1697357059
2	SHA256 (rust/rustc-1.72.0-src.tar.xz) = d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014	2	SHA256 (rust/rustc-1.73.0-src.tar.xz) = 6eaf672dbea2e6596af8c999f5e6924b9af4bb8b02166bfe0b928e68aa75ae62
3	SIZE (rust/rustc-1.72.0-src.tar.xz) = 151630408	3	SIZE (rust/rustc-1.73.0-src.tar.xz) = 154319536
4	SHA256 (rust/2023-07-13/rustc-1.71.0-aarch64-unknown-freebsd.tar.xz) = 67a63e4bf9f69f0a07a79e759e754d66afdc1a644c08dc699ffb17083e05199e	4	SHA256 (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = f87def3751c86536dc8c2a1ac493d2832bdfb791a31a4782d5f6d47ae384cd5b
5	SIZE (rust/2023-07-13/rustc-1.71.0-aarch64-unknown-freebsd.tar.xz) = 54896968	5	SIZE (rust/2023-08-24/rustc-1.72.0-aarch64-unknown-freebsd.tar.xz) = 54855264
6	SHA256 (rust/2023-07-13/rust-std-1.71.0-aarch64-unknown-freebsd.tar.xz) = 644b1f08cddb684e19eae04f315c464c1ba1af11c09d59eb4449c1635a7a05f3	6	SHA256 (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 6712823eccc77234fe914992f26c37e72e050c85dc78d81f8bcfd5a6c0177779
7	SIZE (rust/2023-07-13/rust-std-1.71.0-aarch64-unknown-freebsd.tar.xz) = 25694436	7	SIZE (rust/2023-08-24/rust-std-1.72.0-aarch64-unknown-freebsd.tar.xz) = 26185760
8	SHA256 (rust/2023-07-13/cargo-1.71.0-aarch64-unknown-freebsd.tar.xz) = 9ed2a3f06431a9e962ab29a3a4d4dc5b2e3703460845d9eec45da9f990618fbb	8	SHA256 (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 957c3061c2d4c9bb03c74c059cdba16da5d8c1ba28ce671d762552e67fe02390
9	SIZE (rust/2023-07-13/cargo-1.71.0-aarch64-unknown-freebsd.tar.xz) = 7197836	9	SIZE (rust/2023-08-24/cargo-1.72.0-aarch64-unknown-freebsd.tar.xz) = 8065312
10	SHA256 (rust/2023-07-13/rustc-1.71.0-x86_64-unknown-freebsd.tar.xz) = 5d2b10d7b7db4117627aafe9e2bcc8002e714da44fa9dd3aedbc0e50ffe1dd80	10	SHA256 (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 7e913d82625e1fa9daaf89948d657944685be4bc3b5e136a312f9dc4230d72f2
11	SIZE (rust/2023-07-13/rustc-1.71.0-x86_64-unknown-freebsd.tar.xz) = 45992472	11	SIZE (rust/2023-08-24/rustc-1.72.0-x86_64-unknown-freebsd.tar.xz) = 46396244
12	SHA256 (rust/2023-07-13/rust-std-1.71.0-x86_64-unknown-freebsd.tar.xz) = 38b75d357110e539af7b6b155903adb8f5800226423da5ada798f7e1f768bb40	12	SHA256 (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = b4982586d84b8d419943083d28f3b3f3992eec99b13dbd7c0a5a8e63bfe3415f
13	SIZE (rust/2023-07-13/rust-std-1.71.0-x86_64-unknown-freebsd.tar.xz) = 26217172	13	SIZE (rust/2023-08-24/rust-std-1.72.0-x86_64-unknown-freebsd.tar.xz) = 26854796
14	SHA256 (rust/2023-07-13/cargo-1.71.0-x86_64-unknown-freebsd.tar.xz) = 1d881ed89e9b4eb686a11bdd2f1bebf907fc2da6061192c40ac579a5b26094c7	14	SHA256 (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 0fd521fb5bf0e3a58210eeb242a22f24f92a94b886905f4b895bc36782a7dd78
15	SIZE (rust/2023-07-13/cargo-1.71.0-x86_64-unknown-freebsd.tar.xz) = 7973836	15	SIZE (rust/2023-08-24/cargo-1.72.0-x86_64-unknown-freebsd.tar.xz) = 8866252
16	SHA256 (rust/2023-07-13/rustc-1.71.0-armv7-unknown-freebsd.tar.xz) = f2b9db2d046da7494e7c2b0b613f9f469124b6e3711b4904b7207b8d9c39964c	16	SHA256 (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = cd8dfc34e5901dd2845835c7c7978f6a5725e15a3925eaba551b49e104355d4b
17	SIZE (rust/2023-07-13/rustc-1.71.0-armv7-unknown-freebsd.tar.xz) = 53254816	17	SIZE (rust/2023-08-24/rustc-1.72.0-armv7-unknown-freebsd.tar.xz) = 55045532
18	SHA256 (rust/2023-07-13/rust-std-1.71.0-armv7-unknown-freebsd.tar.xz) = a81c72e919a340bdc93e2009d8623fa47f01db342a170d0dd563a06bc00ccb30	18	SHA256 (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 519b61de0c56b11f5403a31f5198d93b2109ce7e9777df4899943c97c95c8ee0
19	SIZE (rust/2023-07-13/rust-std-1.71.0-armv7-unknown-freebsd.tar.xz) = 25050696	19	SIZE (rust/2023-08-24/rust-std-1.72.0-armv7-unknown-freebsd.tar.xz) = 25630140
20	SHA256 (rust/2023-07-13/cargo-1.71.0-armv7-unknown-freebsd.tar.xz) = bb27f0be22140081b613802cd9f0c38682bc02c7716d41d9ccaa0d861cfc2d47	20	SHA256 (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 90287dcb755268a67c5959c36d21270d04685ee55878d0314998272b32738dc1
21	SIZE (rust/2023-07-13/cargo-1.71.0-armv7-unknown-freebsd.tar.xz) = 7071008	21	SIZE (rust/2023-08-24/cargo-1.72.0-armv7-unknown-freebsd.tar.xz) = 7944012
22	SHA256 (rust/2023-07-13/rustc-1.71.0-i686-unknown-freebsd.tar.xz) = 23f9a1fc89db35766dca997bd1f841dd058610f1761989105097710586407c57	22	SHA256 (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 103910d967b01ad2a27a886bfca8b64842be9a2b044074f58f56c6cccd2270fe
23	SIZE (rust/2023-07-13/rustc-1.71.0-i686-unknown-freebsd.tar.xz) = 61659320	23	SIZE (rust/2023-08-24/rustc-1.72.0-i686-unknown-freebsd.tar.xz) = 61326204
24	SHA256 (rust/2023-07-13/rust-std-1.71.0-i686-unknown-freebsd.tar.xz) = e6b35baff3bcc7dd7feb1447eeaef54fef4136c75af2e6f4b218ff52507b9d63	24	SHA256 (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 1747a9d544c759b8fab05a172f90c5eabde9be4b370d564177487be56549ae52
25	SIZE (rust/2023-07-13/rust-std-1.71.0-i686-unknown-freebsd.tar.xz) = 26212032	25	SIZE (rust/2023-08-24/rust-std-1.72.0-i686-unknown-freebsd.tar.xz) = 26697152
26	SHA256 (rust/2023-07-13/cargo-1.71.0-i686-unknown-freebsd.tar.xz) = eca40d3ec40bad1aec54851768e3a307db38d5989a7b2be80deb4a8dd2983bd2	26	SHA256 (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = eaed4aef4ad1341ebf990fdd264fb639635bc4840221074534af74e443f45f51
27	SIZE (rust/2023-07-13/cargo-1.71.0-i686-unknown-freebsd.tar.xz) = 8338280	27	SIZE (rust/2023-08-24/cargo-1.72.0-i686-unknown-freebsd.tar.xz) = 9249016
28	SHA256 (rust/2023-07-13/rustc-1.71.0-powerpc-unknown-freebsd.tar.xz) = d4bd4f7c38ede47def389ff8b8bf1f994fd15f9ae05824facb48bf8ada1d7ba2	28	SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 43f44d1fd8194921b391d5c46c30163e42742073015dcc713c34ff35a0067bb5
29	SIZE (rust/2023-07-13/rustc-1.71.0-powerpc-unknown-freebsd.tar.xz) = 60245728	29	SIZE (rust/2023-08-24/rustc-1.72.0-powerpc-unknown-freebsd.tar.xz) = 60208348
30	SHA256 (rust/2023-07-13/rust-std-1.71.0-powerpc-unknown-freebsd.tar.xz) = 48c3f746fdcedb1decefd5f9bd70343b0b8b7573ffd0b65ea77a67b0ce90ab60	30	SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = de731b713a68c6db6e2bf05a02b8fdee0969cdb80dda756c41956d9a00a3194c
31	SIZE (rust/2023-07-13/rust-std-1.71.0-powerpc-unknown-freebsd.tar.xz) = 24179884	31	SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc-unknown-freebsd.tar.xz) = 24553168
32	SHA256 (rust/2023-07-13/cargo-1.71.0-powerpc-unknown-freebsd.tar.xz) = 30e1c54c7844094f6c463cc4a9be7455e207db598d12fb9203e47d6951b7de53	32	SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = d266f36de042cad9dd310febad76cf8d11ac1f188e2ce751b95841d7724ae4c8
33	SIZE (rust/2023-07-13/cargo-1.71.0-powerpc-unknown-freebsd.tar.xz) = 8248108	33	SIZE (rust/2023-08-24/cargo-1.72.0-powerpc-unknown-freebsd.tar.xz) = 9247480
34	SHA256 (rust/2023-07-13/rustc-1.71.0-powerpc64-unknown-freebsd.tar.xz) = e57a31a65f3ee3b3540c17ed20ea72895a9ea063a5cd7f621571947c75a982cd	34	SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 333d82f18d75b3fcf9ee7afc578bd0ee09a1a1c1f8f9308d0b1c4f9159ca4d2f
35	SIZE (rust/2023-07-13/rustc-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 58478560	35	SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 58536072
36	SHA256 (rust/2023-07-13/rust-std-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 5ba721993d54d15e6fe87001641eaf30aab2fd099e03119656898809bb607db1	36	SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = d371b600719dc4f500d6a453d64fc713fba0a188ad6c02c72fe25e2e413468a8
37	SIZE (rust/2023-07-13/rust-std-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 24186732	37	SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 24770180
38	SHA256 (rust/2023-07-13/cargo-1.71.0-powerpc64-unknown-freebsd.tar.xz) = c46c43a943f2ff631a53c4efb5882756ec0a164368135a54d0f719a65333d1a4	38	SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = ba4b5d2df913151e70b7d406c49163915b640f7ab6a4360ce0132e5cfa5ad891
39	SIZE (rust/2023-07-13/cargo-1.71.0-powerpc64-unknown-freebsd.tar.xz) = 7780232	39	SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64-unknown-freebsd.tar.xz) = 8793828
40	SHA256 (rust/2023-07-13/rustc-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = aefb51616e8165e6dac99291520746a024b71d28c814a2570817473f1a6a20d2	40	SHA256 (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 44eb1bf540f146fb8fafa7585639b08592f0934e81cc95ae4bfdd7d8662da0ad
41	SIZE (rust/2023-07-13/rustc-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 60218776	41	SIZE (rust/2023-08-24/rustc-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 60191980
42	SHA256 (rust/2023-07-13/rust-std-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 2f80c9979e9a9dfe4f00fc62fae02656b5263e55c73b990e14b2140cdc620dc5	42	SHA256 (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 656950dca59bf303e40263f92694242ec62d992f08a224c600765254e6a20acc
43	SIZE (rust/2023-07-13/rust-std-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 24236100	43	SIZE (rust/2023-08-24/rust-std-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 24904632
44	SHA256 (rust/2023-07-13/cargo-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 17d3145ab8f3d8d28562364f40f25db2fda9b526044e598095eea5cc28e56fec	44	SHA256 (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = a2d11bb9a49f91e3da992fd4d8b141d7221c218a7b2e07af4d1bb486ba95253f
45	SIZE (rust/2023-07-13/cargo-1.71.0-powerpc64le-unknown-freebsd.tar.xz) = 8014976	45	SIZE (rust/2023-08-24/cargo-1.72.0-powerpc64le-unknown-freebsd.tar.xz) = 9067788
46	SHA256 (rust/2023-07-13/rustc-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = efb38a182166f01d4d31a6534afcbaff3c6a1f58bf90f8db5cfd8016ee4ac520	46	SHA256 (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = a0b184b96203a4bd99c78ff61f228f843a6bfbdb6a7c690f1424e55a78c44e41
47	SIZE (rust/2023-07-13/rustc-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 70827420	47	SIZE (rust/2023-08-24/rustc-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 70320872
48	SHA256 (rust/2023-07-13/rust-std-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 4ca3b70a9839e567b62fdc71bcbf35782262ec97c35c5a29a02309e8b76efd63	48	SHA256 (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24904a553337220e8b50caaec5fe0309c3ef40c58b57102e2b9ee9131c3b981c
49	SIZE (rust/2023-07-13/rust-std-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 24375500	49	SIZE (rust/2023-08-24/rust-std-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 24923728
50	SHA256 (rust/2023-07-13/cargo-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = b49977e17a42a9175cfa016941a6006f8e188f610f4ed59945f114fcb9f04820	50	SHA256 (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 52ef515ce550b58954cc71a19696e8bdeee24037273458d4115259725343bd40
51	SIZE (rust/2023-07-13/cargo-1.71.0-riscv64gc-unknown-freebsd.tar.xz) = 10130160	51	SIZE (rust/2023-08-24/cargo-1.72.0-riscv64gc-unknown-freebsd.tar.xz) = 11394328
52	SHA256 (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 5a6b67dfc1218ea953421816834ffe3aa8ac1fc078dfaea4ebab121460ca5211	52	SHA256 (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 5a6b67dfc1218ea953421816834ffe3aa8ac1fc078dfaea4ebab121460ca5211
53	SIZE (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 2007	53	SIZE (rust/71958da4854176c50a8b12470b956d5c7ed11817.patch) = 2007
54	SHA256 (rust/6ddf9128b2b55f9def80af57f7353d2521527c6a.patch) = 6eaaaf6714c496b610712aa9ecbe1a1614e042323ec872fbf31a0a74c9020f29	54	SHA256 (rust/6ddf9128b2b55f9def80af57f7353d2521527c6a.patch) = 6eaaaf6714c496b610712aa9ecbe1a1614e042323ec872fbf31a0a74c9020f29
55	-
56	--> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5	55	--> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
57	\|	56	\|
58	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^	57	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
59	--
60	www/firefox/files/patch-rust-1.73.0 \| 83 +++++++++++++++++++++++++++++	58	www/firefox/files/patch-rust-1.73.0 \| 83 +++++++++++++++++++++++++++++
61	1 file changed, 83 insertions(+)	59	1 file changed, 83 insertions(+)
62	create mode 100644 www/firefox/files/patch-rust-1.73.0	60	create mode 100644 www/firefox/files/patch-rust-1.73.0

Added Link Here

(-)b/www/firefox/files/patch-rust-1.73.0 (-2 / +83 lines)
0	-	1	From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
		2	From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
		3	Date: Mon, 10 Jul 2023 09:46:53 +0000
		4	Subject: [PATCH] Stop using old-style `simd_shuffle`
		5
		6	---
		7	src/codegen/llvm.rs \| 20 +++++++-------------
		8	1 file changed, 7 insertions(+), 13 deletions(-)
		9
		10	diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
		11	index b4c09849..bb482fac 100644
		12	--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
		13	+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
		14	@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
		15	#[allow(unused_imports)] // FIXME: spurious warning?
		16	use crate::sealed::Simd;
		17
		18	-// Shuffle intrinsics: expanded in users' crates, therefore public.
		19	extern "platform-intrinsic" {
		20	- pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
		21	- pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
		22	- pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
		23	- pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
		24	- pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
		25	- pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
		26	+ fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
		27	}
		28
		29	#[allow(clippy::missing_safety_doc)]
		30	@@ -22,7 +16,7 @@ where
		31	T: Simd,
		32	<T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
		33	{
		34	- simd_shuffle2(x, y, IDX)
		35	+ simd_shuffle(x, y, IDX)
		36	}
		37
		38	#[allow(clippy::missing_safety_doc)]
		39	@@ -32,7 +26,7 @@ where
		40	T: Simd,
		41	<T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
		42	{
		43	- simd_shuffle4(x, y, IDX)
		44	+ simd_shuffle(x, y, IDX)
		45	}
		46
		47	#[allow(clippy::missing_safety_doc)]
		48	@@ -42,7 +36,7 @@ where
		49	T: Simd,
		50	<T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
		51	{
		52	- simd_shuffle8(x, y, IDX)
		53	+ simd_shuffle(x, y, IDX)
		54	}
		55
		56	#[allow(clippy::missing_safety_doc)]
		57	@@ -52,7 +46,7 @@ where
		58	T: Simd,
		59	<T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
		60	{
		61	- simd_shuffle16(x, y, IDX)
		62	+ simd_shuffle(x, y, IDX)
		63	}
		64
		65	#[allow(clippy::missing_safety_doc)]
66	@@ -62,7 +56,7 @@ where
67	T: Simd,
68	<T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
69	{
70	- simd_shuffle32(x, y, IDX)
71	+ simd_shuffle(x, y, IDX)
72	}
73
74	#[allow(clippy::missing_safety_doc)]
75	@@ -72,7 +66,7 @@ where
76	T: Simd,
77	<T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
78	{
79	- simd_shuffle64(x, y, IDX)
80	+ simd_shuffle(x, y, IDX)
81	}
82
83	extern "platform-intrinsic" {
1	--> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5	84	--> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
2	\|	85	\|
3	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^	86	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4	--
5	www/tor-browser/files/patch-rust-1.73.0 \| 83 +++++++++++++++++++++++++	87	www/tor-browser/files/patch-rust-1.73.0 \| 83 +++++++++++++++++++++++++
6	1 file changed, 83 insertions(+)	88	1 file changed, 83 insertions(+)
7	create mode 100644 www/tor-browser/files/patch-rust-1.73.0	89	create mode 100644 www/tor-browser/files/patch-rust-1.73.0

Added Link Here

(-)b/www/tor-browser/files/patch-rust-1.73.0 (-2 / +83 lines)
0	-	1	From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
		2	From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
		3	Date: Mon, 10 Jul 2023 09:46:53 +0000
		4	Subject: [PATCH] Stop using old-style `simd_shuffle`
		5
		6	---
		7	src/codegen/llvm.rs \| 20 +++++++-------------
		8	1 file changed, 7 insertions(+), 13 deletions(-)
		9
		10	diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
		11	index b4c09849..bb482fac 100644
		12	--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
		13	+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
		14	@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
		15	#[allow(unused_imports)] // FIXME: spurious warning?
		16	use crate::sealed::Simd;
		17
		18	-// Shuffle intrinsics: expanded in users' crates, therefore public.
		19	extern "platform-intrinsic" {
		20	- pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
		21	- pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
		22	- pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
		23	- pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
		24	- pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
		25	- pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
		26	+ fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
		27	}
		28
		29	#[allow(clippy::missing_safety_doc)]
		30	@@ -22,7 +16,7 @@ where
		31	T: Simd,
		32	<T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
		33	{
		34	- simd_shuffle2(x, y, IDX)
		35	+ simd_shuffle(x, y, IDX)
		36	}
		37
		38	#[allow(clippy::missing_safety_doc)]
		39	@@ -32,7 +26,7 @@ where
		40	T: Simd,
		41	<T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
		42	{
		43	- simd_shuffle4(x, y, IDX)
		44	+ simd_shuffle(x, y, IDX)
		45	}
		46
		47	#[allow(clippy::missing_safety_doc)]
		48	@@ -42,7 +36,7 @@ where
		49	T: Simd,
		50	<T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
		51	{
		52	- simd_shuffle8(x, y, IDX)
		53	+ simd_shuffle(x, y, IDX)
		54	}
		55
		56	#[allow(clippy::missing_safety_doc)]
		57	@@ -52,7 +46,7 @@ where
		58	T: Simd,
		59	<T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
		60	{
		61	- simd_shuffle16(x, y, IDX)
		62	+ simd_shuffle(x, y, IDX)
		63	}
		64
		65	#[allow(clippy::missing_safety_doc)]
66	@@ -62,7 +56,7 @@ where
67	T: Simd,
68	<T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
69	{
70	- simd_shuffle32(x, y, IDX)
71	+ simd_shuffle(x, y, IDX)
72	}
73
74	#[allow(clippy::missing_safety_doc)]
75	@@ -72,7 +66,7 @@ where
76	T: Simd,
77	<T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
78	{
79	- simd_shuffle64(x, y, IDX)
80	+ simd_shuffle(x, y, IDX)
81	}
82
83	extern "platform-intrinsic" {
1	--> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5	84	--> /wrkdirs/usr/ports/www/librewolf/work/librewolf-117.0-1/third_party/rust/packed_simd_2/src/codegen/llvm.rs:10:5
2	\|	85	\|
3	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^	86	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4	--
5	www/librewolf/files/patch-rust-1.73.0 \| 83 +++++++++++++++++++++++++++	87	www/librewolf/files/patch-rust-1.73.0 \| 83 +++++++++++++++++++++++++++
6	1 file changed, 83 insertions(+)	88	1 file changed, 83 insertions(+)
7	create mode 100644 www/librewolf/files/patch-rust-1.73.0	89	create mode 100644 www/librewolf/files/patch-rust-1.73.0

Added Link Here

(-)b/www/librewolf/files/patch-rust-1.73.0 (-1 / +83 lines)
0	-	1	From a79edf4cfc54aad30a5630b217645c4b8274d8f7 Mon Sep 17 00:00:00 2001
		2	From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
		3	Date: Mon, 10 Jul 2023 09:46:53 +0000
		4	Subject: [PATCH] Stop using old-style `simd_shuffle`
		5
		6	---
		7	src/codegen/llvm.rs \| 20 +++++++-------------
		8	1 file changed, 7 insertions(+), 13 deletions(-)
		9
		10	diff --git third_party/rust/packed_simd_2/src/codegen/llvm.rs third_party/rust/packed_simd_2/src/codegen/llvm.rs
		11	index b4c09849..bb482fac 100644
		12	--- third_party/rust/packed_simd_2/src/codegen/llvm.rs
		13	+++ third_party/rust/packed_simd_2/src/codegen/llvm.rs
		14	@@ -5,14 +5,8 @@ use crate::sealed::Shuffle;
		15	#[allow(unused_imports)] // FIXME: spurious warning?
		16	use crate::sealed::Simd;
		17
		18	-// Shuffle intrinsics: expanded in users' crates, therefore public.
		19	extern "platform-intrinsic" {
		20	- pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
		21	- pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
		22	- pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
		23	- pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
		24	- pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
		25	- pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
		26	+ fn simd_shuffle<T, I, U>(x: T, y: T, idx: I) -> U;
		27	}
		28
		29	#[allow(clippy::missing_safety_doc)]
		30	@@ -22,7 +16,7 @@ where
		31	T: Simd,
		32	<T as Simd>::Element: Shuffle<[u32; 2], Output = U>,
		33	{
		34	- simd_shuffle2(x, y, IDX)
		35	+ simd_shuffle(x, y, IDX)
		36	}
		37
		38	#[allow(clippy::missing_safety_doc)]
		39	@@ -32,7 +26,7 @@ where
		40	T: Simd,
		41	<T as Simd>::Element: Shuffle<[u32; 4], Output = U>,
		42	{
		43	- simd_shuffle4(x, y, IDX)
		44	+ simd_shuffle(x, y, IDX)
		45	}
		46
		47	#[allow(clippy::missing_safety_doc)]
		48	@@ -42,7 +36,7 @@ where
		49	T: Simd,
		50	<T as Simd>::Element: Shuffle<[u32; 8], Output = U>,
		51	{
		52	- simd_shuffle8(x, y, IDX)
		53	+ simd_shuffle(x, y, IDX)
		54	}
		55
		56	#[allow(clippy::missing_safety_doc)]
		57	@@ -52,7 +46,7 @@ where
		58	T: Simd,
		59	<T as Simd>::Element: Shuffle<[u32; 16], Output = U>,
		60	{
		61	- simd_shuffle16(x, y, IDX)
		62	+ simd_shuffle(x, y, IDX)
		63	}
		64
		65	#[allow(clippy::missing_safety_doc)]
66	@@ -62,7 +56,7 @@ where
67	T: Simd,
68	<T as Simd>::Element: Shuffle<[u32; 32], Output = U>,
69	{
70	- simd_shuffle32(x, y, IDX)
71	+ simd_shuffle(x, y, IDX)
72	}
73
74	#[allow(clippy::missing_safety_doc)]
75	@@ -72,7 +66,7 @@ where
76	T: Simd,
77	<T as Simd>::Element: Shuffle<[u32; 64], Output = U>,
78	{
79	- simd_shuffle64(x, y, IDX)
80	+ simd_shuffle(x, y, IDX)
81	}
82
83	extern "platform-intrinsic" {