aboutsummaryrefslogtreecommitdiff
path: root/server/registry/src
diff options
context:
space:
mode:
Diffstat (limited to 'server/registry/src')
-rw-r--r--server/registry/src/lobby.rs4
-rw-r--r--server/registry/src/main.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/server/registry/src/lobby.rs b/server/registry/src/lobby.rs
index 8492fac6..753fdf1c 100644
--- a/server/registry/src/lobby.rs
+++ b/server/registry/src/lobby.rs
@@ -23,13 +23,13 @@ use tokio::{
use tokio_tungstenite::tungstenite::Message;
pub(crate) async fn lobby_wrapper(registry: Arc<RwLock<Registry>>, saddr: SocketAddr) {
- let Err(e) = lobby(registry, saddr).await;
+ let Err(e) = lobby(registry, saddr).await else { unreachable!() };
error!("lobby crashed: {e}");
}
const TILES: &[(&str, bool)] = &[("grass", false), ("black-hole", false)];
-async fn lobby(registry: Arc<RwLock<Registry>>, saddr: SocketAddr) -> Result<!> {
+async fn lobby(registry: Arc<RwLock<Registry>>, saddr: SocketAddr) -> Result<()> {
let ws_listener = TcpListener::bind(saddr).await?;
loop {
diff --git a/server/registry/src/main.rs b/server/registry/src/main.rs
index 3cd252d9..0ccee7f3 100644
--- a/server/registry/src/main.rs
+++ b/server/registry/src/main.rs
@@ -15,7 +15,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#![feature(never_type)]
+
pub mod conn_test;
pub mod list;
pub mod lobby;