From nobody Mon Aug 26 08:09:05 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WsjxZ1Hrqz5VSYZ; Mon, 26 Aug 2024 08:09:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WsjxY4wQpz46hd; Mon, 26 Aug 2024 08:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724659745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjPBme+DK/W2WEvRHZprpHEnj6xNKZgJdglsLnGKdE4=; b=JzhP9HL1dHG4yOUbY5u0oQijdYejJ+liMZJD0U/2QHATnIMjLBn5gAgFMW2UVhXr0z9t0I Cm6kCYsRf8qPj92kyw/mpaVXdVWms2ihRVyOUmzRL/1hcMVNTEHEzERpKWTM+eJYBVIwHZ m1K88ZH5y9k+8n1diVNBdemoDVdUkr2EyaDxC1M3G6lJ/lTetZJ8zMytweJWBK1nZ0G3su gV53WXqk3uNWu1PXiMuxJQL06PVUnlQEpPA5Q17fV95cuGL3KBPk3Wg26UC/Iqb3bOfQQy Bq74oVjh3tDSRHnD4paenqyG9rl/L4JYI1d1AaXFp6m1fa8ZBjoTNagp4mP4SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724659745; a=rsa-sha256; cv=none; b=FQQMgHh91ILbiRsVYn8fbJlZhftwjWIDZcJbHQSIVHSCQkyFCXTym4cNFzfqswkGH/hOs6 OWUWa0i+4lQJIy3E6Jw3EAErffl06ZYkPnUUADytGe+ggFOJ5EGfdqdN66sYddTkPRz8LW 34UDlHJtntxWQb9bEe4g3KAcRwse23J0W+bx0xBJjuJ+sQbCb/Dlvgd7X1CpBc4JtHNZwr EmPIUMBkZYmpjpbtB8TS95VxP79eodMiz/TmWBNJg8Xy8Av9+NrgDVBbAY1BilqgPoAMAg 2a8KuWplaUOpbtf5ZhwpWvYIhiwC0w+pI7dHd2iN9A0IkFhZ7hggwtWyy/8/Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724659745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjPBme+DK/W2WEvRHZprpHEnj6xNKZgJdglsLnGKdE4=; b=x9HVDjsHalfnNgptUQkArD+Oq5f+eIUQWHXRw/Axe8JmzLUrtH0wAeSalZyRRVluhthwe+ aTa25qIxJKEjY8qRMm/2pgXtnvnnrV3fV2YMEEBH6OgmMZqgkk4vCKN8K7VlTcFasXSPb9 YxKDU1pQ6EVJKSEfkmOsiLEdf/GI29tYd+lAymENQlqB0J6L38H4IclW4X90YGQNyn97b/ Ps7x4Toq2T84ghfi78qLb3ZoGK6foCcX3A/B93qlDfojflYaONX+lzREs87P1wVy81hVPR L0fKJHi6uTAW/KPixEvxdIbuhfU7pKYx/Hb1/WAEwXthDmthlDL4DNdEzibBKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WsjxY4XDQzyqf; Mon, 26 Aug 2024 08:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47Q8953K024157; Mon, 26 Aug 2024 08:09:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47Q895Vj024154; Mon, 26 Aug 2024 08:09:05 GMT (envelope-from git) Date: Mon, 26 Aug 2024 08:09:05 GMT Message-Id: <202408260809.47Q895Vj024154@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 495d8902fdb9 - main - devel/git-delta: Fix build with rust 1.80.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 495d8902fdb9c38a3fa0f2373c452abce0c838e6 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=495d8902fdb9c38a3fa0f2373c452abce0c838e6 commit 495d8902fdb9c38a3fa0f2373c452abce0c838e6 Author: Mikael Urankar AuthorDate: 2024-08-23 15:38:47 +0000 Commit: Mikael Urankar CommitDate: 2024-08-26 08:07:46 +0000 devel/git-delta: Fix build with rust 1.80.0 PR: 280490 --- devel/git-delta/files/patch-rust-1.80.0 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) 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 +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( + let mut lexed = lexer::lex::(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::, _>>()?; ++ let items = format_items.collect::, _>>()?; + Ok(items.into()) + } +