diff options
Diffstat (limited to 'server/registry')
| -rw-r--r-- | server/registry/src/conn_test.rs | 2 | ||||
| -rw-r--r-- | server/registry/src/list.rs | 6 | ||||
| -rw-r--r-- | server/registry/src/lobby.rs | 4 | ||||
| -rw-r--r-- | server/registry/src/main.rs | 2 | ||||
| -rw-r--r-- | server/registry/src/register.rs | 4 |
5 files changed, 8 insertions, 10 deletions
diff --git a/server/registry/src/conn_test.rs b/server/registry/src/conn_test.rs index 553d1fff..809abc78 100644 --- a/server/registry/src/conn_test.rs +++ b/server/registry/src/conn_test.rs @@ -16,7 +16,7 @@ */ use crate::MAX_ADDR_CACHE; -use anyhow::{bail, Result}; +use anyhow::{Result, bail}; use hurrycurry_client_lib::network::tokio::Network; use hurrycurry_protocol::PacketC; use log::info; diff --git a/server/registry/src/list.rs b/server/registry/src/list.rs index 619700f7..05c2eeab 100644 --- a/server/registry/src/list.rs +++ b/server/registry/src/list.rs @@ -19,15 +19,13 @@ use crate::Registry; use anyhow::Result; use hurrycurry_protocol::registry::Entry; use rocket::{ - get, + Either, Request, State, get, http::{Header, MediaType}, request::{self, FromRequest, Outcome}, response::{ - self, + self, Responder, content::{RawHtml, RawJson}, - Responder, }, - Either, Request, State, }; use std::sync::Arc; use tokio::sync::RwLock; diff --git a/server/registry/src/lobby.rs b/server/registry/src/lobby.rs index 4be2cabd..8492fac6 100644 --- a/server/registry/src/lobby.rs +++ b/server/registry/src/lobby.rs @@ -1,10 +1,10 @@ use crate::Registry; use anyhow::Result; use hurrycurry_protocol::{ - glam::{ivec2, vec2, IVec2, Vec2}, + Gamedata, PacketC, PacketS, PlayerClass, PlayerID, TileIndex, VERSION, + glam::{IVec2, Vec2, ivec2, vec2}, movement::MovementBase, registry::Entry, - Gamedata, PacketC, PacketS, PlayerClass, PlayerID, TileIndex, VERSION, }; use log::{error, info, warn}; use rocket::futures::{SinkExt, StreamExt}; diff --git a/server/registry/src/main.rs b/server/registry/src/main.rs index da7f404b..24ce6621 100644 --- a/server/registry/src/main.rs +++ b/server/registry/src/main.rs @@ -26,7 +26,7 @@ use list::{generate_html_list, generate_json_list, r_list}; use lobby::lobby_wrapper; use log::{error, info}; use register::r_register; -use rocket::{fairing::AdHoc, get, http::Header, routes, shield::Shield, Config}; +use rocket::{Config, fairing::AdHoc, get, http::Header, routes, shield::Shield}; use std::{ cmp::Reverse, collections::HashMap, diff --git a/server/registry/src/register.rs b/server/registry/src/register.rs index 893b2a1d..473e958a 100644 --- a/server/registry/src/register.rs +++ b/server/registry/src/register.rs @@ -15,11 +15,11 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ -use crate::{conn_test::test_connect, Registry, MAX_SERVERS}; +use crate::{MAX_SERVERS, Registry, conn_test::test_connect}; use anyhow::Result; use hurrycurry_protocol::registry::Submission; use log::{debug, info}; -use rocket::{http::hyper::Uri, post, serde::json::Json, State}; +use rocket::{State, http::hyper::Uri, post, serde::json::Json}; use std::{ net::{IpAddr, SocketAddr}, str::FromStr, |