From 87346ea9b91d441e92c476785c2cb979f9a23bf5 Mon Sep 17 00:00:00 2001 From: tom barrett Date: Tue, 27 Feb 2018 03:36:04 -0600 Subject: -set up display for navigation system --- src/bin/client.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/bin') diff --git a/src/bin/client.rs b/src/bin/client.rs index 2e8dd45..d327481 100644 --- a/src/bin/client.rs +++ b/src/bin/client.rs @@ -9,21 +9,17 @@ use space::engines::Engines; use space::navigation::Navigation; use space::module::{Module, from_primitive}; - -fn get_info() -> String { +fn main() { let mut name = String::new(); println!("Ship Name:"); io::stdin().read_line(&mut name).expect("Failed"); + name = name.replace("\n", ""); let mut password = String::new(); println!("Password:"); io::stdin().read_line(&mut password).expect("Failed"); - name.replace("\n", "") + ":" + &password -} - -fn main() { - let send = get_info(); + let send = name.clone() + ":" + &password; let mut stream = TcpStream::connect("localhost:6000").unwrap(); let mut buff_r = BufReader::new(stream.try_clone().unwrap()); @@ -47,6 +43,6 @@ fn main() { match module { Module::Dashboard => Dashboard(buff_r), Module::Engines => Engines(stream), - Module::Navigation => Navigation(stream, buff_r), + Module::Navigation => Navigation(name, stream, buff_r), } } -- cgit v1.2.3