From 007063896e8b310a6711d7ab780962a9f8ed7283 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathandturner@users.noreply.github.com>
Date: Sat, 22 Feb 2020 19:59:40 +1300
Subject: [PATCH] Automatically close raw fd (#383)

---
 src/event.rs             |  2 +-
 src/terminal/sys/unix.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/event.rs b/src/event.rs
index 71eb3f3..ee2a2eb 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -91,7 +91,7 @@ mod read;
 mod source;
 #[cfg(feature = "event-stream")]
 mod stream;
-mod sys;
+pub(crate) mod sys;
 mod timeout;
 
 lazy_static! {
diff --git a/src/terminal/sys/unix.rs b/src/terminal/sys/unix.rs
index b5bd6e4..90fceea 100644
--- a/src/terminal/sys/unix.rs
+++ b/src/terminal/sys/unix.rs
@@ -1,13 +1,13 @@
 //! UNIX related logic for terminal manipulation.
 use std::{io, mem, process, sync::Mutex};
 
+use crate::event::sys::unix::file_descriptor::FileDesc;
+use lazy_static::lazy_static;
 use libc::{
     cfmakeraw, ioctl, tcgetattr, tcsetattr, termios as Termios, winsize, STDIN_FILENO, TCSANOW,
     TIOCGWINSZ,
 };
 
-use lazy_static::lazy_static;
-
 use crate::error::{ErrorKind, Result};
 use std::fs::File;
 use std::os::unix::io::IntoRawFd;
@@ -32,10 +32,10 @@ pub(crate) fn size() -> Result<(u16, u16)> {
         ws_ypixel: 0,
     };
 
-    let file = File::open("/dev/tty").unwrap();
+    let file = File::open("/dev/tty")?;
 
-    if let Ok(true) =
-        wrap_with_result(unsafe { ioctl(file.into_raw_fd(), TIOCGWINSZ.into(), &mut size) })
+    let fd = FileDesc::new(file.into_raw_fd(), true);
+    if let Ok(true) = wrap_with_result(unsafe { ioctl(fd.raw_fd(), TIOCGWINSZ.into(), &mut size) })
     {
         Ok((size.ws_col, size.ws_row))
     } else {
-- 
2.25.1