Date: Tue, 29 Jun 2021 23:23:23 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d3a50ae15530 - main - games/veloren: drop rust < 1.53 workaround after f897ded31edc Message-ID: <202106292323.15TNNNMj045995@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3a50ae15530e720a7fb660123d0e6608531f9ee commit d3a50ae15530e720a7fb660123d0e6608531f9ee Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-06-29 23:09:45 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 <https://github.com/rust-lang/rust/issues/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 - )] -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106292323.15TNNNMj045995>