diff --git a/src/server_conf/listener.rs b/src/server_conf/listener.rs index b77f5a3..56798ff 100644 --- a/src/server_conf/listener.rs +++ b/src/server_conf/listener.rs @@ -3,14 +3,13 @@ use std::net::TcpStream; use std::os::unix::net::UnixListener; use std::os::unix::net::UnixStream; use std::io::{Error, ErrorKind}; -use std::io::prelude::*; pub const TCP_LIS : u8 = 0; pub const UNIX_LIS : u8 = 1; -pub trait NewTrait: std::io::Read + std::io::Write + Send {} -impl NewTrait for TcpStream {} -impl NewTrait for UnixStream {} +pub trait RWTrait: std::io::Read + std::io::Write + Send {} +impl RWTrait for TcpStream {} +impl RWTrait for UnixStream {} pub struct GenericListener { tcp_lis : Option, @@ -46,7 +45,7 @@ impl GenericListener { - pub fn accept(&self) -> Result,Error> { + pub fn accept(&self) -> Result,Error> { match self.type_lis { TCP_LIS => Ok(Box::new(self.tcp_lis.as_ref().unwrap().accept()?.0)), UNIX_LIS => Ok(Box::new(self.unix_lis.as_ref().unwrap().accept()?.0)),