diff options
| author | Mikael Urankar <mikael@FreeBSD.org> | 2024-08-23 15:38:54 +0000 |
|---|---|---|
| committer | Mikael Urankar <mikael@FreeBSD.org> | 2024-08-26 08:07:48 +0000 |
| commit | d72a1325a8deda8e478a4923220f8a78e60a5a5b (patch) | |
| tree | 956ea0a1f639b4d0cf20c25ac58fd5a63f211979 | |
| parent | a5d69cd830f51203467320084c018e7a4b328934 (diff) | |
| download | ports-d72a1325a8deda8e478a4923220f8a78e60a5a5b.tar.gz ports-d72a1325a8deda8e478a4923220f8a78e60a5a5b.zip | |
sysutils/conserve: Fix build with rust 1.80.0
PR: 280490
| -rw-r--r-- | sysutils/conserve/files/patch-rust-1.80.0 | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/sysutils/conserve/files/patch-rust-1.80.0 b/sysutils/conserve/files/patch-rust-1.80.0 new file mode 100644 index 000000000000..adc3fc8b8269 --- /dev/null +++ b/sysutils/conserve/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.28/src/format_description/parse/mod.rs ++++ cargo-crates/time-0.3.28/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()) + } + |