From 847bcb26c5a55196de92be7319dc6d8d5ca676f0 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 6 Aug 2023 19:36:40 -0400 Subject: simplify --- src/sys.rs | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/sys.rs b/src/sys.rs index c3d633c..927fe93 100644 --- a/src/sys.rs +++ b/src/sys.rs @@ -23,25 +23,19 @@ impl Pty { } pub fn set_term_size(&self, size: crate::Size) -> crate::Result<()> { - let size: libc::winsize = size.into(); + let size = libc::winsize::from(size); let fd = self.0.as_raw_fd(); // TODO: upstream this to rustix - unsafe { - let ret = libc::ioctl( - fd, - libc::TIOCSWINSZ, - std::ptr::NonNull::from(&size).as_ptr(), - ); - if ret == -1 { - Err(rustix::io::Errno::from_raw_os_error( - std::io::Error::last_os_error() - .raw_os_error() - .unwrap_or(0), - ) - .into()) - } else { - Ok(()) - } + let ret = unsafe { + libc::ioctl(fd, libc::TIOCSWINSZ, std::ptr::addr_of!(size)) + }; + if ret == -1 { + Err(rustix::io::Errno::from_raw_os_error( + std::io::Error::last_os_error().raw_os_error().unwrap_or(0), + ) + .into()) + } else { + Ok(()) } } -- cgit v1.2.3-54-g00ecf