git: 3f6661723650 - main - editors/amp: Fix build with rust 1.80.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Aug 2024 19:34:57 UTC
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f66617236504ae6dad1f588b41d204d88427284 commit 3f66617236504ae6dad1f588b41d204d88427284 Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-08-28 19:33:52 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-08-28 19:34:45 +0000 editors/amp: Fix build with rust 1.80.0 PR: 280490 --- editors/amp/files/patch-rust-1.80.0 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/editors/amp/files/patch-rust-1.80.0 b/editors/amp/files/patch-rust-1.80.0 new file mode 100644 index 000000000000..332b9f4f5e80 --- /dev/null +++ b/editors/amp/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.orig 2024-08-28 19:19:31 UTC ++++ 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()) + } +