From bca78c0611e1cb27d13f41d058b2056bbcb201af Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 11 Oct 2023 19:15:52 -0300 Subject: [PATCH] drain_filter -> extract_if --- src/lib.rs | 1 + src/ship/items/floor.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 87ec58d..54fc603 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,7 @@ #![allow(clippy::type_complexity)] #![allow(incomplete_features)] #![feature(inline_const)] +#![feature(extract_if)] #![feature(try_blocks)] #![feature(test)] #![feature(error_generic_member_access)] diff --git a/src/ship/items/floor.rs b/src/ship/items/floor.rs index c71b7fd..b0e968f 100644 --- a/src/ship/items/floor.rs +++ b/src/ship/items/floor.rs @@ -96,13 +96,13 @@ pub struct FloorState { impl FloorState { pub fn take_item(&mut self, item_id: &ClientItemId) -> Option { let item = self.local.0 - .drain_filter(|item| { + .extract_if(|item| { item.item_id == *item_id }) .next(); item.or_else(|| { self.shared.0 - .drain_filter(|item| { + .extract_if(|item| { item.item_id == *item_id }) .next()