From f1baf78f1624df79c5a552cb9dc27d0177389198 Mon Sep 17 00:00:00 2001 From: Wayne Warren Date: Sun, 14 Feb 2016 09:04:29 -0800 Subject: [PATCH] Remove Arc from tty::pty return values. --- scaffolding/src/main.rs | 2 +- scaffolding/tty/src/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scaffolding/src/main.rs b/scaffolding/src/main.rs index e051eaf..30a91c0 100644 --- a/scaffolding/src/main.rs +++ b/scaffolding/src/main.rs @@ -55,7 +55,7 @@ fn main() { // Set the TERM variable and establish a TTY connection env::set_var("TERM", "notty"); - let (tty_r, tty_w, handle) = tty::pty("sh", COLS as u16, ROWS as u16); + let (tty_r, tty_w) = tty::pty("sh", COLS as u16, ROWS as u16); // Handler program output (tty -> screen) on separate thread. let (tx_out, rx) = mpsc::channel(); diff --git a/scaffolding/tty/src/lib.rs b/scaffolding/tty/src/lib.rs index 0fe8d56..ef9fa39 100644 --- a/scaffolding/tty/src/lib.rs +++ b/scaffolding/tty/src/lib.rs @@ -38,7 +38,7 @@ struct Winsize { ws_ypixel: libc::c_ushort, } -pub fn pty(name: &str, width: u16, height: u16) -> (Reader, Writer, Arc) { +pub fn pty(name: &str, width: u16, height: u16) -> (Reader, Writer) { let mut amaster = 0; let winsize = Winsize { ws_row: height as libc::c_ushort, @@ -57,7 +57,7 @@ pub fn pty(name: &str, width: u16, height: u16) -> (Reader, Writer, Arc) } n if n > 0 => { let handle = Arc::new(Handle(amaster)); - (Reader(handle.clone()), Writer(handle.clone()), handle) + (Reader(handle.clone()), Writer(handle.clone())) } _ => panic!("Fork failed.") }