From 1dc53dad3acb4e02913738fc19bc2e2ad6d1b121 Mon Sep 17 00:00:00 2001
From: juliancoffee <lightdarkdaughter@gmail.com>
Date: Fri, 29 Oct 2021 23:13:30 +0300
Subject: [PATCH] Make test-server compile again

---
 server/src/sys/terrain.rs | 4 ++--
 server/src/test_world.rs  | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs
index 91a7741d42..cc42738159 100644
--- a/server/src/sys/terrain.rs
+++ b/server/src/sys/terrain.rs
@@ -1,7 +1,7 @@
+#[cfg(not(feature = "worldgen"))]
+use crate::test_world::{IndexOwned, World};
 #[cfg(feature = "persistent_world")]
 use crate::TerrainPersistence;
-#[cfg(not(feature = "worldgen"))]
-use test_world::{IndexOwned, World};
 #[cfg(feature = "worldgen")]
 use world::{IndexOwned, World};
 
diff --git a/server/src/test_world.rs b/server/src/test_world.rs
index 3f0da5f23a..41f6681d38 100644
--- a/server/src/test_world.rs
+++ b/server/src/test_world.rs
@@ -26,10 +26,7 @@ pub struct IndexOwned;
 pub struct IndexRef<'a>(&'a IndexOwned);
 
 impl IndexOwned {
-    pub fn reload_colors_if_changed<R>(
-        &mut self,
-        _reload: impl FnOnce(&mut Self) -> R,
-    ) -> Option<R> {
+    pub fn reload_if_changed<R>(&mut self, _reload: impl FnOnce(&mut Self) -> R) -> Option<R> {
         None
     }