From db4587d3ec64b7e28691b43f9d9701939eed94d1 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 3 Jun 2025 20:00:18 +0200 Subject: update rust toolchain and rust dependencies. `map_many_mut` and `trait_upcasting` was stabilized. --- server/src/entity/conveyor.rs | 3 ++- server/src/entity/item_portal.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'server/src/entity') diff --git a/server/src/entity/conveyor.rs b/server/src/entity/conveyor.rs index 6177ba9c..4c50365d 100644 --- a/server/src/entity/conveyor.rs +++ b/server/src/entity/conveyor.rs @@ -65,7 +65,8 @@ impl Entity for Conveyor { if self.from == self.to { bail!("conveyor does ends in itself") } - let [Some(from), Some(to)] = c.game.tiles.get_many_mut([&self.from, &self.to]) else { + let [Some(from), Some(to)] = c.game.tiles.get_disjoint_mut([&self.from, &self.to]) + else { bail!("at least one conveyor end not on map"); }; diff --git a/server/src/entity/item_portal.rs b/server/src/entity/item_portal.rs index 3ea33fa6..ef73e6ec 100644 --- a/server/src/entity/item_portal.rs +++ b/server/src/entity/item_portal.rs @@ -31,7 +31,7 @@ impl Entity for ItemPortal { if self.from == self.to { bail!("item portal ends in itself") } - let [Some(from), Some(to)] = c.game.tiles.get_many_mut([&self.from, &self.to]) else { + let [Some(from), Some(to)] = c.game.tiles.get_disjoint_mut([&self.from, &self.to]) else { bail!("at least one item portal end not on map"); }; -- cgit v1.2.3-70-g09d2