jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

drain_filter -> extract_if

Browse Source
This commit is contained in:
andy 2023-10-11 19:15:52 -03:00
parent 647bba57da
commit bca78c0611
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@ -1,6 +1,7 @@
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![feature(inline_const)] #![feature(inline_const)]
#![feature(extract_if)]
#![feature(try_blocks)] #![feature(try_blocks)]
#![feature(test)] #![feature(test)]
#![feature(error_generic_member_access)] #![feature(error_generic_member_access)]

4
src/ship/items/floor.rs
View File

@ -96,13 +96,13 @@ pub struct FloorState {
impl FloorState { impl FloorState {
pub fn take_item(&mut self, item_id: &ClientItemId) -> Option<FloorItem> { pub fn take_item(&mut self, item_id: &ClientItemId) -> Option<FloorItem> {
let item = self.local.0 let item = self.local.0
.drain_filter(|item| { .extract_if(|item| {
item.item_id == *item_id item.item_id == *item_id
}) })
.next(); .next();
item.or_else(|| { item.or_else(|| {
self.shared.0 self.shared.0
.drain_filter(|item| { .extract_if(|item| {
item.item_id == *item_id item.item_id == *item_id
}) })
.next() .next()