From nobody Thu Sep 14 07:54:42 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 4RmV370xLMz4scp0; Thu, 14 Sep 2023 07:54:43 +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 4RmV370V5Jz3fnX; Thu, 14 Sep 2023 07:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694678083; 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=iyyIQ2KCEgjqElnwpJxPFRvZEVX9d/C/NjxUq4axX6Y=; b=R5qww77U5vS68pXyeKlV2NuQsVZNiaCpXrYGZs+KOu733CwyPxjz7kUC+4B7ud3wN0R5zK WBWA6f6zFOgRi6iRxFv4wYGWtIO+Sv4qgpKNvy39zV2rQ2r1ggMsKSlVazJj48NZQUbC1J AM1zTpCt9H0aPABSAzwLQO1nCaSH5WHBo5+qpu2Mi2ejQ3RuxZvSj+CYwnMuuGDuMiLZ1g OpdjOGsuobyYCg7rC3W8lGhl/eJn1lhZVFv4LW2TcblzUCZ3jYxxXRwYBS1rsClifpIvWT PWKJHwInrmRL5Ok2N24UAjghCccyBmjJlX9I/7paVCsvQ939sq44tDUTCMNU9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694678083; a=rsa-sha256; cv=none; b=bC9iVLOQOyw9pa4kn8zzsimKeYmZoVAzLdu2IwwZc/6K+g+K4JnJ5ebeEieqoilWzic8r1 dwtOcW8TMmY8WsXuxXH7rEkt97JB51IG4CEpa5fcyZSjKmVIBSE7vK9dF0DTlyeV2W7bCv io1iodGz4cUB7PLRevRu5l+AWP7GSO6E3Lda4T7N4+3N5mRtbYB9MvKP2EMWReUEU6sC7b Ryn+qK/YaHd3Phbt5GWC3bk2tPFjJ/xJnqF1M/l7FVTqdcMwC9oUlZyDFMMqNp6dcUQ9OV yNfbAwdCYpKDvr1fjreaY+/q8s5JbSS7p8DJxtbAPLAXxbixnhhNQ0vHkXjMvA== 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=1694678083; 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=iyyIQ2KCEgjqElnwpJxPFRvZEVX9d/C/NjxUq4axX6Y=; b=myb0aSE3PVYrGw41rXKo0uD7pMlh4YhQQjbr0+XWnsHCVVUoWkUo1CWyHvY/P2LFqIV4CU /pFBMyfcso+BeGtA5SkMlkDHqcbm6OB1SzKZygAP7t4lkXOhRp9/DQOhGWy3LfOQKZUbcC FP93c2pugzpoXxPH0+G1298fYFjRrpGFsGgvww18GQVnB+D9rRzt4CsON2p2ZPZov2bx7S wMQP20yPNkpFI+tSygUiAxjKhDiKkeCMgwtZgd6meufUBuKz+Jc4VoXi6rqU6faN0LwhpX GiNHqspXoiPUDiQpSrs0TUVjUwRl47YalivQoRNCLzGH8Sl0XCgc1ebYWn3pzg== 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 4RmV366NGmzpQC; Thu, 14 Sep 2023 07:54:42 +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 38E7sg6t075505; Thu, 14 Sep 2023 07:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38E7sgDN075502; Thu, 14 Sep 2023 07:54:42 GMT (envelope-from git) Date: Thu, 14 Sep 2023 07:54:42 GMT Message-Id: <202309140754.38E7sgDN075502@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: b55fc6a70267 - main - games/veloren-weekly: unbreak build after fa874813924c 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b55fc6a70267ca1f9638d9eee36ed38559cdc2fd Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b55fc6a70267ca1f9638d9eee36ed38559cdc2fd commit b55fc6a70267ca1f9638d9eee36ed38559cdc2fd Author: Jan Beich AuthorDate: 2023-09-14 07:13:34 +0000 Commit: Jan Beich CommitDate: 2023-09-14 07:54:10 +0000 games/veloren-weekly: unbreak build after fa874813924c PR: 273579 Submitted by: mikael (drain_filter) Obtained from: upstream (array_zip) --- games/veloren-weekly/Makefile | 1 - games/veloren-weekly/files/patch-rust-1.72 | 179 +++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 1 deletion(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index a2e219c7d131..8fe40e8fd8a1 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -10,7 +10,6 @@ WWW= https://veloren.net/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build with rust 1.72 https://gitlab.com/veloren/veloren/-/issues/1875 BROKEN_aarch64= https://github.com/rust-lang/libc/issues/3217 ONLY_FOR_ARCHS= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= unsupported platform by https://github.com/wasmerio/wasmer diff --git a/games/veloren-weekly/files/patch-rust-1.72 b/games/veloren-weekly/files/patch-rust-1.72 new file mode 100644 index 000000000000..83d5c836df36 --- /dev/null +++ b/games/veloren-weekly/files/patch-rust-1.72 @@ -0,0 +1,179 @@ +https://gitlab.com/veloren/veloren/-/issues/1875 + +--- common/src/lib.rs.orig 2023-09-13 10:25:00 UTC ++++ common/src/lib.rs +@@ -14,7 +14,7 @@ + arbitrary_self_types, + int_roundings + )] +-#![feature(hash_drain_filter)] ++#![feature(hash_extract_if)] + + pub use common_assets as assets; + pub use uuid; +--- common/systems/src/lib.rs.orig 2023-09-13 10:25:00 UTC ++++ common/systems/src/lib.rs +@@ -1,4 +1,4 @@ +-#![feature(drain_filter, let_chains)] ++#![feature(extract_if, let_chains)] + #![allow(clippy::option_map_unit_fn)] + + mod aura; +--- common/systems/src/mount.rs.orig 2023-09-13 10:25:00 UTC ++++ common/systems/src/mount.rs +@@ -61,7 +61,7 @@ impl<'a> System<'a> for Sys { + .map(|c| ( + // Only take inputs and actions from the rider if the mount is not intelligent (TODO: expand the definition of 'intelligent'). + if !matches!(body, Some(Body::Humanoid(_))) { +- let actions = c.actions.drain_filter(|action| match action { ++ let actions = c.actions.extract_if(|action| match action { + ControlAction::StartInput { input: i, .. } + | ControlAction::CancelInput(i) => matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll), + _ => false +@@ -151,7 +151,7 @@ impl<'a> System<'a> for Sys { + let inputs = controllers.get_mut(entity).map(|c| { + let actions: Vec<_> = c + .actions +- .drain_filter(|action| match action { ++ .extract_if(|action| match action { + ControlAction::StartInput { input: i, .. } + | ControlAction::CancelInput(i) => { + matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll) +--- network/protocol/src/lib.rs.orig 2023-09-13 10:25:00 UTC ++++ network/protocol/src/lib.rs +@@ -1,4 +1,4 @@ +-#![feature(drain_filter)] ++#![feature(extract_if)] + //! Network Protocol + //! + //! a I/O-Free protocol for the veloren network crate. +--- network/protocol/src/quic.rs.orig 2023-09-13 10:25:00 UTC ++++ network/protocol/src/quic.rs +@@ -388,7 +388,7 @@ where + // try to order pending + let mut pending_violated = false; + let mut reliable = vec![]; +- self.pending_reliable_buffers.drain_filter(|(_, buffer)| { ++ self.pending_reliable_buffers.extract_if(|(_, buffer)| { + // try to get Sid without touching buffer + let mut testbuffer = buffer.clone(); + match ITFrame::read_frame(&mut testbuffer) { +--- server/src/lib.rs.orig 2023-09-13 10:25:00 UTC ++++ server/src/lib.rs +@@ -3,13 +3,13 @@ + #![deny(clippy::clone_on_ref_ptr)] + #![feature( + box_patterns, +- drain_filter, ++ extract_if, + let_chains, + never_type, + option_zip, + unwrap_infallible + )] +-#![feature(hash_drain_filter)] ++#![feature(hash_extract_if)] + + pub mod automod; + mod character_creator; +--- server/src/persistence/character_updater.rs.orig 2023-09-13 10:25:00 UTC ++++ server/src/persistence/character_updater.rs +@@ -267,7 +267,7 @@ impl CharacterUpdater { + } + + pub fn process_batch_completion(&mut self, completed_batch_id: u64) { +- self.pending_database_actions.drain_filter(|_, event| { ++ self.pending_database_actions.extract_if(|_, event| { + matches!(event, DatabaseAction::Submitted { + batch_id, + } if completed_batch_id == *batch_id) +--- voxygen/src/lib.rs.orig 2023-09-13 10:25:00 UTC ++++ voxygen/src/lib.rs +@@ -4,8 +4,7 @@ + #![deny(clippy::clone_on_ref_ptr)] + #![feature( + array_methods, +- array_zip, +- drain_filter, ++ extract_if, + trait_alias, + option_get_or_insert_default, + map_try_insert, +--- voxygen/src/render/pipelines/bloom.rs.orig 2023-09-13 10:25:00 UTC ++++ voxygen/src/render/pipelines/bloom.rs +@@ -112,7 +112,7 @@ impl BloomLayout { + device: &wgpu::Device, + src_color: &wgpu::TextureView, + sampler: &wgpu::Sampler, +- half_pixel: Consts, ++ half_pixel: &Consts, + ) -> BindGroup { + let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor { + label: None, +--- voxygen/src/render/pipelines/trail.rs.orig 2023-09-13 10:25:00 UTC ++++ voxygen/src/render/pipelines/trail.rs +@@ -39,7 +39,7 @@ impl Add for Vertex { + + fn add(self, other: Self) -> Self::Output { + Self { +- pos: self.pos.zip(other.pos).map(|(a, b)| a + b), ++ pos: core::array::from_fn(|i| self.pos[i] + other.pos[i]), + } + } + } +--- voxygen/src/render/renderer/locals.rs.orig 2023-09-13 10:25:00 UTC ++++ voxygen/src/render/renderer/locals.rs +@@ -58,10 +58,11 @@ impl Locals { + ); + + let bloom_binds = bloom.map(|bloom| { +- bloom +- .src_views +- .zip(bloom.locals) // zip arrays +- .map(|(view, locals)| layouts.bloom.bind(device, view, sampler, locals)) ++ core::array::from_fn(|i| { ++ layouts ++ .bloom ++ .bind(device, bloom.src_views[i], sampler, &bloom.locals[i]) ++ }) + }); + + Self { +@@ -107,10 +108,11 @@ impl Locals { + &self.postprocess, + ); + self.bloom_binds = bloom.map(|bloom| { +- bloom +- .src_views +- .zip(bloom.locals) // zip arrays +- .map(|(view, locals)| layouts.bloom.bind(device, view, sampler, locals)) ++ core::array::from_fn(|i| { ++ layouts ++ .bloom ++ .bind(device, bloom.src_views[i], sampler, &bloom.locals[i]) ++ }) + }); + } + } +--- voxygen/src/scene/math.rs.orig 2023-09-13 10:25:00 UTC ++++ voxygen/src/scene/math.rs +@@ -250,7 +250,7 @@ pub fn clip_object_by_plane