Skip to content

Commit 10dd635

Browse files
committed
Use extract_if in replacement for drain_filter
In rust-lang/rust#104455, `drain_filter` has been renamed to `extract_if`.
1 parent ff15542 commit 10dd635

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

server/src/game.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ impl Game {
173173
let revived = self
174174
.state
175175
.dead
176-
.drain_filter(|corpse| corpse.respawn <= now)
176+
.extract_if(|corpse| corpse.respawn <= now)
177177
.map(|dead| dead.player)
178178
.map(|player| {
179179
println!("revived player {}", player.id);
@@ -236,7 +236,7 @@ impl Game {
236236
}
237237
}
238238

239-
for mut player in self.state.players.drain_filter(|player| colliding_buf.contains(&player.id)) {
239+
for mut player in self.state.players.extract_if(|player| colliding_buf.contains(&player.id)) {
240240
player.randomize(&mut self.rng, bounds);
241241
self.state
242242
.dead
@@ -249,7 +249,7 @@ impl Game {
249249
let bounds = self.bounds();
250250

251251
for bullet in &mut self.state.bullets {
252-
let deceased = self.state.players.drain_filter(|player| {
252+
let deceased = self.state.players.extract_if(|player| {
253253
if player.is_colliding(bullet) && bullet.player_id != player.id {
254254
println!(
255255
"Player {} killed player {} at ({}, {})",

server/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(drain_filter)]
1+
#![feature(extract_if)]
22

33
#[macro_use]
44
extern crate log;

0 commit comments

Comments
 (0)