diff options
| -rw-r--r-- | src/main.rs | 1 | ||||
| -rw-r--r-- | src/pos.rs | 9 | ||||
| -rw-r--r-- | src/util.rs | 6 | ||||
| -rw-r--r-- | src/worldmessages.rs | 7 |
4 files changed, 4 insertions, 19 deletions
diff --git a/src/main.rs b/src/main.rs index 0dea859..b17160a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -47,7 +47,6 @@ use self::{ server::unixserver::UnixServer, server::tcpserver::TcpServer, server::Server, - util::ToJson, defaultencyclopedia::default_encyclopedia, persistence::FileStorage, controls::Action, @@ -1,9 +1,9 @@ use std::ops::Add; -use serde_json::{Value, json}; +use serde_json::Value; use serde::{Serialize, Serializer, ser::SerializeTuple}; -use crate::util::{clamp, ToJson}; +use crate::util::clamp; #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy, Default)] pub struct Pos { @@ -57,8 +57,3 @@ impl Add<Pos> for Pos { } } -impl ToJson for Pos { - fn to_json(&self) -> Value { - json!([self.x, self.y]) - } -} diff --git a/src/util.rs b/src/util.rs index 1aee8a4..db572c6 100644 --- a/src/util.rs +++ b/src/util.rs @@ -2,17 +2,11 @@ use std::error::Error; use std::fmt::{Display, Formatter}; use std::cmp::{min, max}; -use serde_json::Value; pub fn clamp<T: Ord>(val: T, lower: T, upper: T) -> T{ max(min(val, upper), lower) } -pub trait ToJson { - fn to_json(&self) -> Value; -} - - pub type AnyError = Box<dyn Error + 'static>; pub type Result<T> = std::result::Result<T, AnyError>; diff --git a/src/worldmessages.rs b/src/worldmessages.rs index 8d45c6e..1a56c55 100644 --- a/src/worldmessages.rs +++ b/src/worldmessages.rs @@ -2,7 +2,6 @@ use std::collections::HashMap; use serde_json::{Value, json}; use serde::Serialize; -use crate::util::ToJson; use crate::{ Pos, Sprite, @@ -40,10 +39,8 @@ macro_rules! worldmessages { pub fn is_empty(&self) -> bool { true $( && self.$name.is_none())* } - } - - impl ToJson for WorldMessage { - fn to_json(&self) -> Value { + + pub fn to_json(&self) -> Value { let mut updates: Vec<Value> = Vec::new(); $( if let Some(update) = &self.$name { |