Use extract_if in replacement for drain_filter

In rust-lang/rust#104455, `drain_filter` has been renamed to `extract_if`.
Vuta · Dec 2, 2023 · 10dd635 · 10dd635
1 parent ff15542
commit 10dd635
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/game.rs b/server/src/game.rs
@@ -173,7 +173,7 @@ impl Game {
         let revived = self
             .state
             .dead
-            .drain_filter(|corpse| corpse.respawn <= now)
+            .extract_if(|corpse| corpse.respawn <= now)
             .map(|dead| dead.player)
             .map(|player| {
                 println!("revived player {}", player.id);
@@ -236,7 +236,7 @@ impl Game {
             }
         }
 
-        for mut player in self.state.players.drain_filter(|player| colliding_buf.contains(&player.id)) {
+        for mut player in self.state.players.extract_if(|player| colliding_buf.contains(&player.id)) {
             player.randomize(&mut self.rng, bounds);
             self.state
                 .dead
@@ -249,7 +249,7 @@ impl Game {
         let bounds = self.bounds();
 
         for bullet in &mut self.state.bullets {
-            let deceased = self.state.players.drain_filter(|player| {
+            let deceased = self.state.players.extract_if(|player| {
                 if player.is_colliding(bullet) && bullet.player_id != player.id {
                     println!(
                         "Player {} killed player {} at ({}, {})",

diff --git a/server/src/main.rs b/server/src/main.rs
@@ -1,4 +1,4 @@
-#![feature(drain_filter)]
+#![feature(extract_if)]
 
 #[macro_use]
 extern crate log;