From nobody Mon Sep 11 06:49:34 2023 X-Original-To: dev-commits-ports-all@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 4RkclM0m3yz4t24J; Mon, 11 Sep 2023 06:49:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkclM0K7Bz4Mmt; Mon, 11 Sep 2023 06:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694414975; 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=25i2yd6fCqhnhi4aTlSn/JkTYvgWlJfWdXXKyThEh9U=; b=mnTqBC6sIPylVEfR+vPio1TVH2JnVZqXeQsD17OVpfuQIX/zWjdagihdKMVQxHtnnSzdKh 548hfPc0rbACFLFBzXGAIF8ymYIVbnSrG7RzGy1IGT9CxWL0ihtGS9OQy1OGkoyazhhuIP rho6Fi/dea9xiYJpG7hTyNyTnebMXwi3WkJlsatBtHC9OB4u2kc7h/v3ixfPvAelNn2Z8i wE3Z9cqlg8pViZSkQh0dmlPcxI9rJpMueti3gju+OPPei3pBoDtd74q7ZlI7wqIKMsMY/y VeTI6Zk+O6uyQ03ZhTh5IlJuv5Oja4+1T3tg+YxByE79B9ZN9TYRAdQwU7tdoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694414975; a=rsa-sha256; cv=none; b=DgsnTsXpqxkgV+KY0qvbZhCjmlhQ0tY8FRPDj2LCqnK8R9aQm/XR03GbH8mGEyE9vrGCyW h5Cd5XERKeNeNW2AR30flI/nFd1COmkd4IfHLGaRCfP0dctZ6vlsM64obmA/B1rruyNqPn lK2nPnOh8oXO1GXDvUv/dBwZiQi+OBsCLnC2WtINr/1hoJ10gJGf2GYoZx/ktLvEmI+YYx 9lzBMswEFEUNzsmL7g2TryAuexDFSrIKXFHZRIjXG9+qyo1boGTeo3fsjrKq2/XXkRlHiH 0xF+lxq0AXBbiy9PcxG2YnC4XWdMCi/WrGxiXxKITLrPRvtXdI1aW+Jxx8KXQw== 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=1694414975; 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=25i2yd6fCqhnhi4aTlSn/JkTYvgWlJfWdXXKyThEh9U=; b=bAPSoMFvjDoEIaZUNijosP5USyVMWx82XxffP12HoJ4BIA4fqINyhydJTAwwX0JyuLJqse 555+VM5lNmspztx2McSbgU9E95qpEq82CPmdd+z/M5bJJQbw86DxbLALvwIBQXS8Gcunvd 3ZE4w2NFIxLEME5e204ra1PnVbcO+re9CtalJrpM0niuRTbrxo7Nq0ggXTjxrxnv2fwlCU EtpAaOBr08JmpO6dYT7AC5fQgjjjR9ROWQSIzP8/i2znO9DlTcrIfgQ5GP2oSVz7YG5Eb3 jl7ndpSKHGNOxuAC+v1Zw+skvEgi3RFAOgP+YJHnzAMmTOR/txwbUT974g8kZg== 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 4RkclL6C0Dzfdj; Mon, 11 Sep 2023 06:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B6nYYa076165; Mon, 11 Sep 2023 06:49:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B6nYTl076162; Mon, 11 Sep 2023 06:49:34 GMT (envelope-from git) Date: Mon, 11 Sep 2023 06:49:34 GMT Message-Id: <202309110649.38B6nYTl076162@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: 185d84b7d0a2 - main - x11/eww: Fix build with rust 1.72.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 185d84b7d0a20a033c5f36a54635a17939a3bf99 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=185d84b7d0a20a033c5f36a54635a17939a3bf99 commit 185d84b7d0a20a033c5f36a54635a17939a3bf99 Author: Mikael Urankar AuthorDate: 2023-09-01 16:13:21 +0000 Commit: Mikael Urankar CommitDate: 2023-09-11 06:49:29 +0000 x11/eww: Fix build with rust 1.72.0 Approved by: portmgr (build fix blanket) --- x11/eww/distinfo | 2 +- x11/eww/files/patch-rust-1.72.0 | 58 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/x11/eww/distinfo b/x11/eww/distinfo index f19312ec1222..d949d745975e 100644 --- a/x11/eww/distinfo +++ b/x11/eww/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1663703127 +TIMESTAMP = 1693583209 SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47 SIZE (rust/crates/ahash-0.7.6.crate) = 38030 SHA256 (rust/crates/aho-corasick-0.7.19.crate) = b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e diff --git a/x11/eww/files/patch-rust-1.72.0 b/x11/eww/files/patch-rust-1.72.0 new file mode 100644 index 000000000000..790a30a8e58f --- /dev/null +++ b/x11/eww/files/patch-rust-1.72.0 @@ -0,0 +1,58 @@ +https://github.com/elkowar/eww/commit/acf255f24a19cad47fdc05e2a031325bab17c822 + +From acf255f24a19cad47fdc05e2a031325bab17c822 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=A9clairevoyant?= + <848000+eclairevoyant@users.noreply.github.com> +Date: Sat, 29 Jul 2023 08:48:13 -0400 +Subject: [PATCH] Comply with rust-lang/rfcs#2140 (#815) + +--- + crates/eww/src/error_handling_ctx.rs | 2 +- + crates/eww/src/main.rs | 4 +- + crates/eww/src/widgets/widget_definitions.rs | 2 +- + 5 files changed, 544 insertions(+), 417 deletions(-) + +diff --git a/crates/eww/src/error_handling_ctx.rs b/crates/eww/src/error_handling_ctx.rs +index 32732003..05af2724 100644 +--- crates/eww/src/error_handling_ctx.rs ++++ crates/eww/src/error_handling_ctx.rs +@@ -53,7 +53,7 @@ pub fn anyhow_err_to_diagnostic(err: &anyhow::Error) -> Option + } + + pub fn stringify_diagnostic(mut diagnostic: codespan_reporting::diagnostic::Diagnostic) -> anyhow::Result { +- diagnostic.labels.drain_filter(|label| Span(label.range.start, label.range.end, label.file_id).is_dummy()); ++ diagnostic.labels.retain(|label| !Span(label.range.start, label.range.end, label.file_id).is_dummy()); + + let mut config = term::Config::default(); + let mut chars = Chars::box_drawing(); +diff --git a/crates/eww/src/main.rs b/crates/eww/src/main.rs +index 1e61c3bf..9211d03b 100644 +--- crates/eww/src/main.rs ++++ crates/eww/src/main.rs +@@ -1,9 +1,9 @@ + #![feature(trace_macros)] +-#![feature(drain_filter)] ++#![feature(extract_if)] + #![feature(box_patterns)] + #![feature(slice_concat_trait)] + #![feature(try_blocks)] +-#![feature(hash_drain_filter)] ++#![feature(hash_extract_if)] + #![allow(rustdoc::private_intra_doc_links)] + + extern crate gtk; +diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs +index 2cdc9071..a1429407 100644 +--- crates/eww/src/widgets/widget_definitions.rs ++++ crates/eww/src/widgets/widget_definitions.rs +@@ -127,7 +127,7 @@ static DEPRECATED_ATTRS: Lazy> = + /// @desc these properties apply to _all_ widgets, and can be used anywhere! + pub(super) fn resolve_widget_attrs(bargs: &mut BuilderArgs, gtk_widget: >k::Widget) -> Result<()> { + let deprecated: HashSet<_> = DEPRECATED_ATTRS.to_owned(); +- let contained_deprecated: Vec<_> = bargs.unhandled_attrs.drain_filter(|a, _| deprecated.contains(&a.0 as &str)).collect(); ++ let contained_deprecated: Vec<_> = bargs.unhandled_attrs.extract_if(|a, _| deprecated.contains(&a.0 as &str)).collect(); + if !contained_deprecated.is_empty() { + let diag = error_handling_ctx::stringify_diagnostic(gen_diagnostic! { + kind = Severity::Error, +diff --git a/rust-toolchain.toml b/rust-toolchain.toml +index 3d6465bf..1ffbc91b 100644