+1

src/main.rs

··· 2 2 3 3 mod cli; 4 4 mod game; 5 5 + mod network; 5 6 mod parser; 6 7 7 8 fn main() -> ExitCode {

+38

src/network.rs

··· 1 1 + use std::net::{SocketAddr, TcpListener, TcpStream}; 2 2 + 3 3 + pub enum NetworkError { 4 4 + IO(std::io::Error), 5 5 + NoIncomingConnexionError, 6 6 + } 7 7 + 8 8 + impl From<std::io::Error> for NetworkError { 9 9 + fn from(value: std::io::Error) -> Self { 10 10 + NetworkError::IO(value) 11 11 + } 12 12 + } 13 13 + 14 14 + struct TcpPlayer { 15 15 + connexion_stream: TcpStream, 16 16 + } 17 17 + 18 18 + impl TcpPlayer { 19 19 + pub fn host(addr: SocketAddr) -> Result<TcpPlayer, NetworkError> { 20 20 + let listener = TcpListener::bind(addr)?; 21 21 + let mut streams = listener.incoming(); 22 22 + let stream = streams 23 23 + .next() 24 24 + .ok_or(NetworkError::NoIncomingConnexionError)??; 25 25 + 26 26 + Ok(TcpPlayer { 27 27 + connexion_stream: stream, 28 28 + }) 29 29 + } 30 30 + 31 31 + pub fn join(addr: SocketAddr) -> Result<TcpPlayer, NetworkError> { 32 32 + let stream = TcpStream::connect(addr)?; 33 33 + 34 34 + Ok(TcpPlayer { 35 35 + connexion_stream: stream, 36 36 + }) 37 37 + } 38 38 + }

+1 -1

src/parser.rs

··· 17 17 18 18 pub fn parse_file(file_path: &Path) -> Result<[Boat; 4], ParserError> { 19 19 let mut file = File::open(file_path)?; 20 20 - Ok(parse_ships(&mut file)?) 20 20 + parse_ships(&mut file) 21 21 } 22 22 23 23 pub fn parse_ships<T: Read>(file: &mut T) -> Result<[Boat; 4], ParserError> {