aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2024-02-10 12:56:58 +0000
committerMikael Urankar <mikael@FreeBSD.org>2024-02-19 11:59:03 +0000
commit12b61685376912714439e5c96a18c6d9b29b83a4 (patch)
treedca3c21a47190f223d7c859e9afc7cbab8d16f03
parent2e82ac54849cbebff77b81da8ede0bb96cfeba46 (diff)
downloadports-12b61685376912714439e5c96a18c6d9b29b83a4.tar.gz
ports-12b61685376912714439e5c96a18c6d9b29b83a4.zip
lang/rustpython: Fix build with rust 1.76.0
Import upstream patch [1] to fix the following error: error[E0512]: cannot transmute between types of different sizes, or dependently-sized types --> /wrkdirs/usr/ports/lang/rustpython/work/Parser-0.3.0/ast/src/impls.rs:60:1 [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270383 PR: 276920 Approved by: portmgr (build fix blanket)
-rw-r--r--lang/rustpython/files/patch-Parser-0.3.0_ast_src_impls.rs34
1 files changed, 34 insertions, 0 deletions
diff --git a/lang/rustpython/files/patch-Parser-0.3.0_ast_src_impls.rs b/lang/rustpython/files/patch-Parser-0.3.0_ast_src_impls.rs
new file mode 100644
index 000000000000..6ecf8cdfef73
--- /dev/null
+++ b/lang/rustpython/files/patch-Parser-0.3.0_ast_src_impls.rs
@@ -0,0 +1,34 @@
+From 29c4728dbedc7e69cc2560b9b34058bbba9b1303 Mon Sep 17 00:00:00 2001
+From: "Jeong, YunWon" <69878+youknowone@users.noreply.github.com>
+Date: Thu, 28 Dec 2023 01:36:46 +0900
+Subject: [PATCH] remove size assertions to avoid nightly error (#111)
+
+---
+ ast/src/impls.rs | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/ast/src/impls.rs b/ast/src/impls.rs
+index 594fadb3..8c788593 100644
+--- ../Parser-0.3.0/ast/src/impls.rs
++++ ../Parser-0.3.0/ast/src/impls.rs
+@@ -54,11 +54,12 @@ impl<R> Expr<R> {
+ }
+ }
+
+-#[cfg(target_arch = "x86_64")]
+-static_assertions::assert_eq_size!(crate::Expr, [u8; 72]);
+-#[cfg(target_arch = "x86_64")]
+-static_assertions::assert_eq_size!(crate::Stmt, [u8; 160]);
+-#[cfg(target_arch = "x86_64")]
+-static_assertions::assert_eq_size!(crate::Pattern, [u8; 96]);
+-#[cfg(target_arch = "x86_64")]
+-static_assertions::assert_eq_size!(crate::ExceptHandler, [u8; 64]);
++// TODO: make this a #[test] to avoid eq comparison
++// #[cfg(target_arch = "x86_64")]
++// static_assertions::assert_eq_size!(crate::Expr, [u8; 72]);
++// #[cfg(target_arch = "x86_64")]
++// static_assertions::assert_eq_size!(crate::Stmt, [u8; 160]);
++// #[cfg(target_arch = "x86_64")]
++// static_assertions::assert_eq_size!(crate::Pattern, [u8; 96]);
++// #[cfg(target_arch = "x86_64")]
++// static_assertions::assert_eq_size!(crate::ExceptHandler, [u8; 64]);