From nobody Thu Jan 30 00:59:44 2025 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 4Yk0zj0lm1z5mWb4; Thu, 30 Jan 2025 00:59:45 +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 4Yk0zj01Z8z3Qvw; Thu, 30 Jan 2025 00:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738198785; 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=DCKINSqemxJ9hCy2TA7ZBDA+FtpFZBvqZP8pnQ2/QbE=; b=KUkDbKVo5ngBM7F4us4fu6rtc08NPXqVDW7WtDcmIknwGFp1xNaiZEru2e4VqXEZkJ9YE0 PrP7xxq+AwCskOQHZ/O5erh6ka9TTT1Z6tgH3b1YXH8XapeyxdRpogvJNzDPWs5cmuQ8Po UZHrlLQq0EA2/EoxZVWEpLSbI2D+YYu5s9czum1+2ihgei8XRIkd4n4aYXZD+NBXv9K4BI fUdWXkSmQIaup+xmJEppwTwkRO/dvFPwZ/AYR0GWM6WsLXpNb+JE53E1qGoKJV1BCMIk+q MIt3WAKDNVwtcb+Gstdvd2A+1pUSPL35A6sXMdaKqAREgskNZix3uhcJdEkrzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738198785; 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=DCKINSqemxJ9hCy2TA7ZBDA+FtpFZBvqZP8pnQ2/QbE=; b=lOW+Grmpv/glJ+MwY8g1Uu/oH7BYFtPYQC5jwSriVSLra5IOJQjFOsf78NyVOQ4hxyR+0e eouYT19JIe13CFZArkNu8hYHWi8PM7zG6NFUSrjAhHIyZrV8wiIXzGgH8Zwj6OruV4HyBa 17Q/80vnq6MpK9qaqlJ56hKo6oYL3oNMgnRspta2P1p0gxv0lrrTaXXPL8lHBiZ5ak0xTb cjABKVEzxKeDhXowT/lXNP1+y75c9khU4LKpsPjJR5LceLC4len8eC8GwoAtSI48vHhB8Y hvTi41vHHotzU7/XfNcZo0g9EkxfITQ6aiQGnawMNe+f6YUHrxevQmlwxYzVBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738198785; a=rsa-sha256; cv=none; b=a9kFxXl1GE/tOJAmDt/QbnbkW4NCkktXVpF3MfkhkKayNlAmcWDTq+arWF3XHVmD2EJbYD /BRG0P5scugzLwoXwmS3jnfVwrcyeGP0nyQGedAAni0yUb4xdfqEx/Fh8wtKv1tFUO/oHC x9i5oG3bRwM1prjpNsqAEdJJA13xbgQbvt8fPXP/YDrKLf8D1T7H0x7WKe9RQYJzRt8zul 7zxumgdC4v5n0KXieHDJc36m8piZYWtcorFN5WoNZFPS3w/B+e6b2gKzYUnYvRFWeOVMkW 7jEftHXEexOVgpo1scYL0kQiMIDilFce180FTKmFmCBs0pVNkMxmfjDRma0CZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yk0zh6SKzz8pc; Thu, 30 Jan 2025 00:59:44 +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 50U0xiHS038717; Thu, 30 Jan 2025 00:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50U0xilx038714; Thu, 30 Jan 2025 00:59:44 GMT (envelope-from git) Date: Thu, 30 Jan 2025 00:59:44 GMT Message-Id: <202501300059.50U0xilx038714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 2e0e0c62cbef - 2025Q1 - games/veloren-weekly: unbreak build after 53274b1a3736 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 2e0e0c62cbefe4f1b63b2f490c102d50dd515a58 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e0e0c62cbefe4f1b63b2f490c102d50dd515a58 commit 2e0e0c62cbefe4f1b63b2f490c102d50dd515a58 Author: Jan Beich AuthorDate: 2025-01-30 00:58:38 +0000 Commit: Jan Beich CommitDate: 2025-01-30 00:59:39 +0000 games/veloren-weekly: unbreak build after 53274b1a3736 error[E0277]: expected a `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` --> common/systems/src/mount.rs:74:49 | 74 | ... .extract_if(.., |action| match action { | ---------- ^^ expected an `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` | | | required by a bound introduced by this call | = help: the trait `for<'a> FnMut(&'a mut veloren_common::comp::ControlAction)` is not implemented for `RangeFull` note: required by a bound in `Vec::::extract_if` --> /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/mod.rs:3236:12 | 3234 | pub fn extract_if(&mut self, filter: F) -> ExtractIf<'_, T, F, A> | ---------- required by a bound in this associated function 3235 | where 3236 | F: FnMut(&mut T) -> bool, | ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Vec::::extract_if` error[E0277]: expected a `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` --> common/systems/src/mount.rs:74:38 | 74 | ... .extract_if(.., |action| match action { | ^^^^^^^^^^ expected an `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` | = help: the trait `for<'a> FnMut(&'a mut veloren_common::comp::ControlAction)` is not implemented for `RangeFull` note: required by a bound in `std::vec::ExtractIf` --> /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/extract_if.rs:28:8 | 22 | pub struct ExtractIf< | --------- required by a bound in this struct ... 28 | F: FnMut(&mut T) -> bool, | ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ExtractIf` error[E0061]: this method takes 1 argument but 2 arguments were supplied --> common/systems/src/mount.rs:74:38 | 74 | ... .extract_if(.., |action| match action { | ________________________^^^^^^^^^^_____- 75 | | ... ControlAction::StartInput { input: i, .. } 76 | | ... | ControlAction::CancelInput(i) => matches!( 77 | | ... i, ... | 80 | | ... _ => false, 81 | | ... }) | |_______________________- unexpected argument #2 of type `{closure@common/systems/src/mount.rs:74:53: 74:61}` | note: method defined here --> /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/mod.rs:3234:12 | 3234 | pub fn extract_if(&mut self, filter: F) -> ExtractIf<'_, T, F, A> | ^^^^^^^^^^ help: remove the extra argument | 74 - .extract_if(.., |action| match action { 75 - ControlAction::StartInput { input: i, .. } 76 - | ControlAction::CancelInput(i) => matches!( 77 - i, 78 - InputKind::Jump | InputKind::Fly | InputKind::Roll 79 - ), 80 - _ => false, 81 - }) 74 + .extract_if(..) | error[E0599]: the method `collect` exists for struct `ExtractIf<'_, ControlAction, RangeFull>`, but its trait bounds were not satisfied --> common/systems/src/mount.rs:82:38 | 72 | ... let actions = c | _____________________________________- 73 | | ... .actions 74 | | ... .extract_if(.., |action| match action { 75 | | ... ControlAction::StartInput { input: i, .. } ... | 81 | | ... }) 82 | | ... .collect(); | | -^^^^^^^ method cannot be called on `ExtractIf<'_, ControlAction, RangeFull>` due to unsatisfied trait bounds | |___________________________| | | ::: /usr/local/lib/rustlib/src/rust/library/core/src/ops/range.rs:43:1 | 43 | pub struct RangeFull; | -------------------- doesn't satisfy `<_ as FnOnce<(&mut ControlAction,)>>::Output = bool` or `_: FnMut<(&mut ControlAction,)>` | ::: /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/extract_if.rs:22:1 | 22 | / pub struct ExtractIf< 23 | | 'a, 24 | | T, 25 | | F, 26 | | #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global, 27 | | > where | |_- doesn't satisfy `_: Iterator` | = note: the following trait bounds were not satisfied: `>::Output = bool` which is required by `std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` `RangeFull: FnMut<(&mut veloren_common::comp::ControlAction,)>` which is required by `std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` `std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` which is required by `&mut std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` error[E0277]: expected a `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` --> common/systems/src/mount.rs:183:33 | 183 | .extract_if(.., |action| match action { | ---------- ^^ expected an `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` | | | required by a bound introduced by this call | = help: the trait `for<'a> FnMut(&'a mut veloren_common::comp::ControlAction)` is not implemented for `RangeFull` note: required by a bound in `Vec::::extract_if` --> /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/mod.rs:3236:12 | 3234 | pub fn extract_if(&mut self, filter: F) -> ExtractIf<'_, T, F, A> | ---------- required by a bound in this associated function 3235 | where 3236 | F: FnMut(&mut T) -> bool, | ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Vec::::extract_if` error[E0277]: expected a `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` --> common/systems/src/mount.rs:183:22 | 183 | .extract_if(.., |action| match action { | ^^^^^^^^^^ expected an `FnMut(&mut veloren_common::comp::ControlAction)` closure, found `RangeFull` | = help: the trait `for<'a> FnMut(&'a mut veloren_common::comp::ControlAction)` is not implemented for `RangeFull` note: required by a bound in `std::vec::ExtractIf` --> /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/extract_if.rs:28:8 | 22 | pub struct ExtractIf< | --------- required by a bound in this struct ... 28 | F: FnMut(&mut T) -> bool, | ^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ExtractIf` error[E0061]: this method takes 1 argument but 2 arguments were supplied --> common/systems/src/mount.rs:183:22 | 183 | .extract_if(.., |action| match action { | ______________________^^^^^^^^^^_____- 184 | | ControlAction::StartInput { input: i, .. } 185 | | | ControlAction::CancelInput(i) => { 186 | | matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll) 187 | | }, 188 | | _ => false, 189 | | }) | |_____________________- unexpected argument #2 of type `{closure@common/systems/src/mount.rs:183:37: 183:45}` | note: method defined here --> /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/mod.rs:3234:12 | 3234 | pub fn extract_if(&mut self, filter: F) -> ExtractIf<'_, T, F, A> | ^^^^^^^^^^ help: remove the extra argument | 183 - .extract_if(.., |action| match action { 184 - ControlAction::StartInput { input: i, .. } 185 - | ControlAction::CancelInput(i) => { 186 - matches!(i, InputKind::Jump | InputKind::Fly | InputKind::Roll) 187 - }, 188 - _ => false, 189 - }) 183 + .extract_if(..) | error[E0599]: the method `collect` exists for struct `ExtractIf<'_, ControlAction, RangeFull>`, but its trait bounds were not satisfied --> common/systems/src/mount.rs:190:22 | 181 | let actions: Vec<_> = c | _______________________________________- 182 | | .actions 183 | | .extract_if(.., |action| match action { 184 | | ControlAction::StartInput { input: i, .. } ... | 189 | | }) 190 | | .collect(); | | -^^^^^^^ method cannot be called on `ExtractIf<'_, ControlAction, RangeFull>` due to unsatisfied trait bounds | |_____________________| | | ::: /usr/local/lib/rustlib/src/rust/library/core/src/ops/range.rs:43:1 | 43 | pub struct RangeFull; | -------------------- doesn't satisfy `<_ as FnOnce<(&mut ControlAction,)>>::Output = bool` or `_: FnMut<(&mut ControlAction,)>` | ::: /usr/local/lib/rustlib/src/rust/library/alloc/src/vec/extract_if.rs:22:1 | 22 | / pub struct ExtractIf< 23 | | 'a, 24 | | T, 25 | | F, 26 | | #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global, 27 | | > where | |_- doesn't satisfy `_: Iterator` | = note: the following trait bounds were not satisfied: `>::Output = bool` which is required by `std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` `RangeFull: FnMut<(&mut veloren_common::comp::ControlAction,)>` which is required by `std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` `std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` which is required by `&mut std::vec::ExtractIf<'_, veloren_common::comp::ControlAction, RangeFull>: Iterator` Some errors have detailed explanations: E0061, E0277, E0599. For more information about an error, try `rustc --explain E0061`. error: could not compile `veloren-common-systems` (lib) due to 8 previous errors (cherry picked from commit 182ff2d0ad1b7a63a644f6d122de5ef871fe4b20) --- games/veloren-weekly/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index df19b68d7987..4348e1286340 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -48,10 +48,6 @@ CARGO_ENV+= RUSTC_BOOTSTRAP=1 # XXX https://github.com/rust-lang/cargo/issues/4101 CARGO_INSTALL_PATH= server-cli voxygen -# https://github.com/yoanlcq/vek/issues/96 -CARGO_BUILDDEP= no -BUILD_DEPENDS+= rust182>0:lang/rust182 - post-patch: # .git/ directory is missing, so don't abort if git binary is also missing @${REINPLACE_CMD} -e 's/"git"/"${TRUE}"/' \