summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authortroido <troido@protonmail.com>2019-01-24 19:47:20 +0100
committertroido <troido@protonmail.com>2019-01-24 19:47:20 +0100
commit864335ea6007dbfebe87ff717aeec8478ca10ec5 (patch)
treeadd9e380a9d83cc8380dc59d6ab1583751012abf /src/server
parentd4d03e2f6c495858faeb1560754a6f34a62e76d1 (diff)
made gameserver its own file
Diffstat (limited to 'src/server')
-rw-r--r--src/server/tcpserver.rs5
-rw-r--r--src/server/unixserver.rs5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/server/tcpserver.rs b/src/server/tcpserver.rs
index b411634..924d1e5 100644
--- a/src/server/tcpserver.rs
+++ b/src/server/tcpserver.rs
@@ -5,7 +5,8 @@ use std::net::SocketAddr;
use mio::net::{TcpListener, TcpStream};
use slab::Slab;
-use self::super::streamconnection::StreamConnection;
+use super::streamconnection::StreamConnection;
+use super::Server;
pub struct TcpServer {
@@ -24,7 +25,7 @@ impl TcpServer {
}
}
-impl super::Server for TcpServer {
+impl Server for TcpServer {
fn accept_pending_connections(&mut self) -> Vec<usize> {
let mut new_connections = Vec::new();
diff --git a/src/server/unixserver.rs b/src/server/unixserver.rs
index dc9feab..f3181de 100644
--- a/src/server/unixserver.rs
+++ b/src/server/unixserver.rs
@@ -9,7 +9,8 @@ use nix::sys::socket::getsockopt;
use nix::sys::socket::sockopt;
use users;
-use self::super::streamconnection::StreamConnection;
+use super::streamconnection::StreamConnection;
+use super::Server;
pub struct UnixServer {
@@ -30,7 +31,7 @@ impl UnixServer {
}
-impl super::Server for UnixServer {
+impl Server for UnixServer {
fn accept_pending_connections(&mut self) -> Vec<usize> {
let mut new_connections = Vec::new();