Update according the new nightly build.

[crypto_lab1.git] / lab1_rust / src / end_point.rs

diff --git a/lab1_rust/src/end_point.rs b/lab1_rust/src/end_point.rs
index cb67226..bf8d4de 100644 (file)
--- a/lab1_rust/src/end_point.rs
+++ b/lab1_rust/src/end_point.rs
@@ -8,7 +8,7 @@ use packet::{ Packet, Command, Answer, Error, ReadingResult, PacketType };
 static DEFAULT_TIMEOUT: Option<u64> = Some(500); // [ms].
 
 pub struct Server {
-   acceptor: TcpAcceptor
+   acceptor: TcpAcceptor,
 }
 
 pub struct Client {
@@ -23,7 +23,7 @@ pub struct EndPoint {
 
 impl Server {
    pub fn new(interface: &str, port: u16, variant: packet::Variant) -> IoResult<Server> {
-      let mut acceptor = try!(TcpListener::bind(interface, port).listen());
+      let mut acceptor = try!(TcpListener::bind((interface, port)).listen());
 
       let server = Server {
          acceptor: acceptor.clone()
@@ -77,12 +77,13 @@ impl Server {
 impl Client {
    pub fn new(address: &str, port: u16, variant: packet::Variant) -> IoResult<Client> {
       Ok(Client { end_point: EndPoint {
-         socket: try!(TcpStream::connect(address, port)),
+         socket: try!(TcpStream::connect((address, port))),
          current_timestamp: 0,
          variant: variant,
       }})
    }
 
+   #[allow(dead_code)]
    pub fn close(&mut self) -> IoResult<()> {
       self.end_point.close()
    }
@@ -117,7 +118,7 @@ impl Client {
       }
    }
 
-   /// Send some valid and not-valid packets to the server and check the result.
+   /// Sends some valid and not-valid packets to the server and check the result.
    /// For each test a new client is created.
    pub fn start_tests(address: &str, port: u16, variant: packet::Variant) {
       let execute = |f: &mut |&mut Client| -> bool| -> bool {
@@ -257,6 +258,7 @@ impl EndPoint {
       EndPoint { socket: socket, current_timestamp: 0 , variant: variant}
    }
 
+   #[allow(dead_code)]
    fn close(&mut self) -> IoResult<()> {
       try!(self.socket.close_read());
       try!(self.socket.close_write());
@@ -267,7 +269,7 @@ impl EndPoint {
       println!("[{}] time: {}. {}", prefix, self.current_timestamp, s);
    }
 
-   /// Send a packet and wait for an answer synchronously.
+   /// Sends a packet and wait for an answer synchronously.
    fn send_with_result(&mut self, p: PacketType) -> IoResult<ReadingResult> {
       match self.send(p) {
          Err(e) => Err(e),
@@ -275,8 +277,8 @@ impl EndPoint {
       }
    }
 
-   /// Send arbitrary data and wait for an answer synchronously.
-   /// Do not increment the current timestamp.
+   /// Sends arbitrary data and wait for an answer synchronously.
+   /// Doesn't increment the current timestamp.
    pub fn send_raw_with_result(&mut self, p: &[u8]) -> IoResult<ReadingResult> {
       self.socket.set_timeout(DEFAULT_TIMEOUT);
       match self.socket.write(p) {