Move Point struct into common module

client/src/game.rs

@@ -1,6 +1,6 @@
 use std::collections::{HashMap, VecDeque};
 
-use crate::util::Point;
+use common::util::Point;
 
 #[derive(PartialEq)]
 pub enum State {

client/src/main.rs

@@ -1,6 +1,5 @@
 mod game;
 mod renderer;
-mod util;
 
 use std::{
     collections::VecDeque,
@@ -9,12 +8,12 @@ use std::{
     net::TcpStream,
 };
 
-use common::packet::{PacketBuilder, PacketType, ReadablePacket};
+use common::{packet::{PacketBuilder, PacketType, ReadablePacket}, util::Point};
 use game::{Direction, GameContext, Snake};
 use renderer::{Renderer, WINDOW_HEIGHT, WINDOW_WIDTH};
 use sdl2::{event::Event, keyboard::Keycode};
 
-use crate::{game::State, util::Point};
+use crate::game::State;
 
 const ADDR: &str = "127.0.0.1:14300";
 

client/src/renderer.rs

@@ -1,6 +1,7 @@
+use common::util::Point;
 use sdl2::{pixels::Color, rect::Rect, render::WindowCanvas, video::Window};
 
-use crate::{game::GameContext, util::Point};
+use crate::game::GameContext;
 
 const BG_COLOR: Color = Color::RGB(24, 24, 24);
 const FOOD_COLOR: Color = Color::RED;

common/src/lib.rs

@@ -1,2 +1,3 @@
 pub mod packet;
+pub mod util;
 

client/src/util.rs → common/src/util.rs

@@ -1,5 +1,6 @@
 use std::ops::Add;
 
+
 #[derive(Clone, Copy, PartialEq)]
 pub struct Point(pub i32, pub i32);
 

server/src/game.rs

@@ -3,10 +3,9 @@ use std::{
     time::{SystemTime, UNIX_EPOCH},
 };
 
+use common::util::Point;
 use rand::{rngs::StdRng, Rng, SeedableRng};
 
-use crate::util::Point;
-
 const WIDTH: i32 = 80;
 const HEIGHT: i32 = 60;
 

server/src/main.rs

@@ -1,5 +1,4 @@
 mod game;
-mod util;
 
 use std::{
     collections::HashMap,
@@ -10,13 +9,12 @@ use std::{
     time::Duration,
 };
 
-use common::packet::{PacketBuilder, PacketType, ReadablePacket};
+use common::{packet::{PacketBuilder, PacketType, ReadablePacket}, util::Point};
 use game::Snake;
 use mio::{
     net::{TcpListener, TcpStream},
     Events, Interest, Poll, Token,
 };
-use util::Point;
 
 use crate::game::{Direction, GameContext};