diff options
| author | Mikael Urankar <mikael@FreeBSD.org> | 2024-08-23 17:38:47 +0200 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2024-08-26 10:07:46 +0200 |
| commit | 495d8902fdb9c38a3fa0f2373c452abce0c838e6 (patch) | |
| tree | c1f5bf657d753461a7f2119260a6fca14cca1acf | |
| parent | devel/cpu_rec_rs: Fix build with rust 1.80.0 (diff) | |
devel/git-delta: Fix build with rust 1.80.0
PR: 280490
| -rw-r--r-- | devel/git-delta/files/patch-rust-1.80.0 | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/devel/git-delta/files/patch-rust-1.80.0 b/devel/git-delta/files/patch-rust-1.80.0 new file mode 100644 index 000000000000..d376fb38b477 --- /dev/null +++ b/devel/git-delta/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.31/src/format_description/parse/mod.rs ++++ cargo-crates/time-0.3.31/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()) + } + |