git: 2945264a2418 - main - x11-wm/leftwm: Fix build with rust 1.80.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 26 Aug 2024 08:09:34 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2945264a24183b9e4a6d9c9dce5ca48ec0a880d1
commit 2945264a24183b9e4a6d9c9dce5ca48ec0a880d1
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-08-23 15:38:59 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-08-26 08:07:49 +0000
x11-wm/leftwm: Fix build with rust 1.80.0
PR: 280490
---
x11-wm/leftwm/files/patch-rust-1.80.0 | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/x11-wm/leftwm/files/patch-rust-1.80.0 b/x11-wm/leftwm/files/patch-rust-1.80.0
new file mode 100644
index 000000000000..9ad286e0bb44
--- /dev/null
+++ b/x11-wm/leftwm/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.30/src/format_description/parse/mod.rs
++++ cargo-crates/time-0.3.30/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())
+ }
+