From owner-dev-commits-ports-all@freebsd.org Tue Jun 29 23:23:24 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C0C165698B; Tue, 29 Jun 2021 23:23:24 +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 4GF0s81RFMz4fX1; Tue, 29 Jun 2021 23:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 15DE121F9B; Tue, 29 Jun 2021 23:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15TNNNxv045996; Tue, 29 Jun 2021 23:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15TNNNMj045995; Tue, 29 Jun 2021 23:23:23 GMT (envelope-from git) Date: Tue, 29 Jun 2021 23:23:23 GMT Message-Id: <202106292323.15TNNNMj045995@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: d3a50ae15530 - main - games/veloren: drop rust < 1.53 workaround after f897ded31edc 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: d3a50ae15530e720a7fb660123d0e6608531f9ee Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2021 23:23:24 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3a50ae15530e720a7fb660123d0e6608531f9ee commit d3a50ae15530e720a7fb660123d0e6608531f9ee Author: Jan Beich AuthorDate: 2021-06-29 23:09:45 +0000 Commit: Jan Beich CommitDate: 2021-06-29 23:21:57 +0000 games/veloren: drop rust < 1.53 workaround after f897ded31edc --- games/veloren/files/patch-rust-1.52 | 88 ------------------------------------- 1 file changed, 88 deletions(-) diff --git a/games/veloren/files/patch-rust-1.52 b/games/veloren/files/patch-rust-1.52 deleted file mode 100644 index 02dc3baa616f..000000000000 --- a/games/veloren/files/patch-rust-1.52 +++ /dev/null @@ -1,88 +0,0 @@ -Drop after lang/rust is updated to 1.53 or later -https://github.com/rust-lang/rust/pull/79278 - -error[E0658]: or-patterns syntax is experimental - --> common/src/comp/inventory/item/mod.rs:858:14 - | -858 | (SpriteKind::DungeonChest0 - | ______________^ -859 | | | SpriteKind::DungeonChest1 -860 | | | SpriteKind::DungeonChest2 -861 | | | SpriteKind::DungeonChest3 -... | -866 | | | SpriteKind::Crate -867 | | | SpriteKind::ChestBuried) => { - | |_____________________________________^ - | - = note: see issue #54883 for more information - = help: add `#![feature(or_patterns)]` to the crate attributes to enable - -error[E0658]: or-patterns syntax is experimental - --> voxygen/anim/src/biped_large/spin.rs:93:21 - | -93 | if let Some(ToolKind::Axe | ToolKind::Hammer | ToolKind::Dagger) = active_tool_kind { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: see issue #54883 for more information - = help: add `#![feature(or_patterns)]` to the crate attributes to enable - -error[E0658]: or-patterns syntax is experimental - --> voxygen/src/audio/sfx/mod.rs:337:25 - | -337 | / object::Body::Arrow -338 | | | object::Body::MultiArrow -339 | | | object::Body::ArrowSnake -340 | | | object::Body::ArrowTurret, - | |___________________________________________________^ - | - = note: see issue #54883 for more information - = help: add `#![feature(or_patterns)]` to the crate attributes to enable - -error[E0658]: or-patterns syntax is experimental - --> world/src/sim/map.rs:237:22 - | -237 | (None | Some(RiverKind::Lake { .. } | RiverKind::Ocean), _) => Rgb::new( - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: see issue #54883 for more information - = help: add `#![feature(or_patterns)]` to the crate attributes to enable - ---- common/src/lib.rs.orig 2021-06-12 08:55:34 UTC -+++ common/src/lib.rs -@@ -12,6 +12,7 @@ - iter_map_while, - label_break_value, - option_zip, -+ or_patterns, - trait_alias, - type_alias_impl_trait - )] ---- voxygen/anim/src/lib.rs.orig 2021-06-12 08:55:34 UTC -+++ voxygen/anim/src/lib.rs -@@ -1,5 +1,6 @@ - #![feature(const_generics)] - #![feature(generic_associated_types)] -+#![feature(or_patterns)] - #![allow(incomplete_features)] - #[cfg(all(feature = "be-dyn-lib", feature = "use-dyn-lib"))] - compile_error!("Can't use both \"be-dyn-lib\" and \"use-dyn-lib\" features at once"); ---- voxygen/src/lib.rs.orig 2021-06-12 08:55:34 UTC -+++ voxygen/src/lib.rs -@@ -8,6 +8,7 @@ - const_generics, - drain_filter, - once_cell, -+ or_patterns, - trait_alias - )] - #![recursion_limit = "2048"] ---- world/src/lib.rs.orig 2021-06-12 08:55:34 UTC -+++ world/src/lib.rs -@@ -13,6 +13,7 @@ - const_generics, - const_panic, - label_break_value, -+ or_patterns, - array_map - )] -