Date: Sat, 7 Sep 2024 11:07:10 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a2e947a8920c - main - security/diswall: Fix build with rust 1.80 Message-ID: <202409071107.487B7AiD094204@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2e947a8920c0236b4e87082c89e1198eba7f257 commit a2e947a8920c0236b4e87082c89e1198eba7f257 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2024-09-07 09:42:57 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2024-09-07 11:07:05 +0000 security/diswall: Fix build with rust 1.80 --- security/diswall/files/patch-rust-1.80.0 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/security/diswall/files/patch-rust-1.80.0 b/security/diswall/files/patch-rust-1.80.0 new file mode 100644 index 000000000000..482000b21d20 --- /dev/null +++ b/security/diswall/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()) + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409071107.487B7AiD094204>