From d57bae3438693d635d7b9965b6188cfead5faf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= <jbb@kaidan.im>
Date: Sun, 23 Jan 2022 13:57:15 +0100
Subject: [PATCH] Replace use of deprecated try macro with ?

---
 src/ffi.rs | 16 ++++++++--------
 src/lib.rs | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/ffi.rs b/src/ffi.rs
index 3dc2648..f97c854 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -116,23 +116,23 @@ pub fn ptsindex<T>(master: &mut T) -> io::Result<u32> where T: AsRawFd {
 }
 
 pub fn ptsname<T>(master: &mut T) -> io::Result<PathBuf> where T: AsRawFd {
-    Ok(Path::new(DEV_PTS_PATH).join(format!("{}", try!(ptsindex(master)))))
+    Ok(Path::new(DEV_PTS_PATH).join(format!("{}", ptsindex(master)?)))
 }
 
 /// Thread-safe (i.e. reentrant) version of `openpty(3)`
 pub fn openpty(termp: Option<&Termios>, winp: Option<&WinSize>) -> io::Result<Pty> {
-    let mut master = try!(getpt());
-    try!(grantpt(&mut master));
-    try!(unlockpt(&mut master));
-    let name = try!(ptsname(&mut master));
-    let slave = try!(open_noctty(&name));
+    let mut master = getpt()?;
+    grantpt(&mut master)?;
+    unlockpt(&mut master)?;
+    let name = ptsname(&mut master)?;
+    let slave = open_noctty(&name)?;
 
     match termp {
-        Some(t) => try!(tcsetattr(slave.as_raw_fd(), termios::TCSAFLUSH, &t)),
+        Some(t) => tcsetattr(slave.as_raw_fd(), termios::TCSAFLUSH, &t)?,
         None => {}
     }
     match winp {
-        Some(w) => try!(set_winsize(&slave, w)),
+        Some(w) => set_winsize(&slave, w)?,
         None => {}
     }
 
diff --git a/src/lib.rs b/src/lib.rs
index c8d305b..0adddbc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -66,8 +66,8 @@ impl TtyServer {
     pub fn new<T>(template: Option<&T>) -> io::Result<TtyServer> where T: AsRawFd {
         // Native runtime does not support RtioTTY::get_winsize()
         let pty = match template {
-            Some(t) => try!(openpty(Some(&try!(Termios::from_fd(t.as_raw_fd()))), Some(&try!(get_winsize(t))))),
-            None => try!(openpty(None, None)),
+            Some(t) => openpty(Some(&Termios::from_fd(t.as_raw_fd())?), Some(&get_winsize(t)?))?,
+            None => openpty(None, None)?,
         };
 
         Ok(TtyServer {
@@ -148,15 +148,15 @@ impl TtyClient {
     pub fn new<T, U>(master: T, peer: U, sigwinch_handler: Option<chan::Receiver<Signal>>) ->
             io::Result<TtyClient> where T: AsRawFd + IntoRawFd, U: AsRawFd + IntoRawFd {
         // Setup peer terminal configuration
-        let termios_orig = try!(Termios::from_fd(peer.as_raw_fd()));
-        let mut termios_peer = try!(Termios::from_fd(peer.as_raw_fd()));
+        let termios_orig = Termios::from_fd(peer.as_raw_fd())?;
+        let mut termios_peer = Termios::from_fd(peer.as_raw_fd())?;
         termios_peer.c_lflag &= !(termios::ECHO | termios::ICANON | termios::ISIG);
         termios_peer.c_iflag &= !(termios::IGNBRK | termios::ICRNL);
         termios_peer.c_iflag |= termios::BRKINT;
         termios_peer.c_cc[termios::VMIN] = 1;
         termios_peer.c_cc[termios::VTIME] = 0;
         // XXX: cfmakeraw
-        try!(tcsetattr(peer.as_raw_fd(), termios::TCSAFLUSH, &termios_peer));
+        tcsetattr(peer.as_raw_fd(), termios::TCSAFLUSH, &termios_peer)?;
 
         // Create the proxy
         let do_flush_main = Arc::new(AtomicBool::new(false));
@@ -173,7 +173,7 @@ impl TtyClient {
 
         let do_flush = do_flush_main.clone();
         let peer_fd = peer.as_raw_fd();
-        let peer_status = try!(unset_append_flag(peer_fd));
+        let peer_status = unset_append_flag(peer_fd)?;
         thread::spawn(move || splice_loop(do_flush, None, m2p_rx.as_raw_fd(), peer_fd));
 
         // Peer to master
@@ -187,7 +187,7 @@ impl TtyClient {
 
         let do_flush = do_flush_main.clone();
         let master_fd = master.as_raw_fd();
-        let master_status = try!(unset_append_flag(master_fd));
+        let master_status = unset_append_flag(master_fd)?;
         thread::spawn(move || splice_loop(do_flush, Some(event_tx), p2m_rx.as_raw_fd(), master_fd));
 
         // Handle terminal resizing