aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2024-08-23 15:38:55 +0000
committerMikael Urankar <mikael@FreeBSD.org>2024-08-26 08:07:48 +0000
commit60a0aa1da19d8b4481d204e6646c122cca9a98cf (patch)
tree8301cbbb477a4243f50bb79fb94b077959f2cb69
parentd514f1381697783d3876f222f047fe322ffd1e70 (diff)
downloadports-60a0aa1da19d8b4481d204e6646c122cca9a98cf.tar.gz
ports-60a0aa1da19d8b4481d204e6646c122cca9a98cf.zip
sysutils/joshuto: Fix build with rust 1.80.0
PR: 280490
-rw-r--r--sysutils/joshuto/files/patch-rust-1.80.025
1 files changed, 25 insertions, 0 deletions
diff --git a/sysutils/joshuto/files/patch-rust-1.80.0 b/sysutils/joshuto/files/patch-rust-1.80.0
new file mode 100644
index 000000000000..482000b21d20
--- /dev/null
+++ b/sysutils/joshuto/files/patch-rust-1.80.0
@@ -0,0 +1,25 @@
+From 5b0c627366babea1636b35db641c0fec964ddbd1 Mon Sep 17 00:00:00 2001
+From: David Tolnay <dtolnay@gmail.com>
+Date: Fri, 15 Mar 2024 20:47:22 -0700
+Subject: [PATCH] Delete identity conversion in format_description::parse_owned
+ (#671)
+
+---
+ time/src/format_description/parse/mod.rs | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/time/src/format_description/parse/mod.rs b/time/src/format_description/parse/mod.rs
+index 1fcc577c9..22ca52591 100644
+--- cargo-crates/time-0.3.34/src/format_description/parse/mod.rs
++++ cargo-crates/time-0.3.34/src/format_description/parse/mod.rs
+@@ -80,9 +80,7 @@ pub fn parse_owned<const VERSION: usize>(
+ let mut lexed = lexer::lex::<VERSION>(s.as_bytes());
+ let ast = ast::parse::<_, VERSION>(&mut lexed);
+ let format_items = format_item::parse(ast);
+- let items = format_items
+- .map(|res| res.map(Into::into))
+- .collect::<Result<Box<_>, _>>()?;
++ let items = format_items.collect::<Result<Box<_>, _>>()?;
+ Ok(items.into())
+ }
+