enhancement: implement AsRaw{Fd,Handle} for tokio::fs::File (tokio-rs…

…#1364)

Moved file.rs to file/mod.rs to get around mod visibility issue.

tokio-fs/src/file.rs → tokio-fs/src/file/mod.rs

@@ -20,6 +20,8 @@ use std::task::Context;
 use std::task::Poll;
 use std::task::Poll::*;
 
+mod os;
+
 /// A reference to an open file on the filesystem.
 ///
 /// This is a specialized version of [`std::fs::File`][std] for usage from the
@@ -117,8 +119,8 @@ impl File {
     /// # }
     /// ```
     pub async fn open<P>(path: P) -> io::Result<File>
-    where
-        P: AsRef<Path>,
+        where
+            P: AsRef<Path>,
     {
         let path = path.as_ref().to_owned();
         let std = asyncify(|| sys::File::open(path)).await?;
@@ -155,8 +157,8 @@ impl File {
     /// # }
     /// ```
     pub async fn create<P>(path: P) -> io::Result<File>
-    where
-        P: AsRef<Path>,
+        where
+            P: AsRef<Path>,
     {
         let path = path.as_ref().to_owned();
         let std_file = asyncify(move || sys::File::create(path)).await?;
@@ -342,7 +344,7 @@ impl File {
             } else {
                 std.set_len(size)
             }
-            .map(|_| 0); // the value is discarded later
+                .map(|_| 0); // the value is discarded later
 
             // Return the result as a seek
             (Operation::Seek(res), buf)

tokio-fs/src/file/os/mod.rs

@@ -0,0 +1,5 @@
+#[cfg(unix)]
+mod unix;
+
+#[cfg(windows)]
+mod windows;

tokio-fs/src/file/os/unix/as_raw_fd.rs

@@ -0,0 +1,10 @@
+use std::os::unix::io::{AsRawFd, RawFd};
+
+use crate::File;
+
+impl AsRawFd for File {
+    fn as_raw_fd(&self) -> RawFd {
+        let std = self.std.clone();
+        std.as_raw_fd()
+    }
+}

tokio-fs/src/file/os/unix/mod.rs

@@ -0,0 +1 @@
+mod as_raw_fd;

tokio-fs/src/file/os/windows/as_raw_handle.rs

@@ -0,0 +1,10 @@
+use std::os::windows::io::{AsRawHandle, RawHandle};
+
+use crate::File;
+
+impl AsRawHandle for File {
+    fn as_raw_handle(&self) -> RawHandle {
+        let std = self.std.clone();
+        std.as_raw_handle()
+    }
+}

tokio-fs/src/file/os/windows/mod.rs

@@ -0,0 +1 @@
+mod as_raw_handle;

tokio-fs/tests/file.rs

@@ -44,6 +44,26 @@ async fn basic_write() {
     assert_eq!(file, HELLO);
 }
 
+#[tokio::test]
+#[cfg(unix)]
+async fn unix_fd() {
+    use std::os::unix::io::AsRawFd;
+    let tempfile = tempfile();
+
+    let file = File::create(tempfile.path()).await.unwrap();
+    assert!(file.as_raw_fd() as u64 > 0);
+}
+
+#[tokio::test]
+#[cfg(windows)]
+async fn windows_handle() {
+    use std::os::windows::io::AsRawHandle;
+    let tempfile = tempfile();
+
+    let file = File::create(tempfile.path()).await.unwrap();
+    assert!(file.as_raw_handle() as u64 > 0);
+}
+
 fn tempfile() -> NamedTempFile {
     NamedTempFile::new().unwrap()
 }

tokio-fs/tests/file_mocked.rs

@@ -10,7 +10,7 @@ mod sys {
 use sys::pool::{self, asyncify};
 
 #[allow(warnings)]
-#[path = "../src/file.rs"]
+#[path = "../src/file/mod.rs"]
 mod file;
 use file::File;
 

tokio-fs/tests/sys/file.rs

@@ -6,6 +6,8 @@ use std::io::prelude::*;
 use std::io::SeekFrom;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
+#[cfg(unix)] use std::os::unix::io::RawFd;
+#[cfg(windows)] use std::os::windows::io::RawHandle;
 
 pub struct File {
     shared: Arc<Mutex<Shared>>,
@@ -196,6 +198,16 @@ impl File {
     pub fn try_clone(&self) -> io::Result<Self> {
         unimplemented!();
     }
+
+    #[cfg(unix)]
+    pub fn as_raw_fd(&self) -> RawFd {
+        unimplemented!()
+    }
+
+    #[cfg(windows)]
+    pub fn as_raw_handle(&self) -> RawHandle {
+        unimplemented!()
+    }
 }
 
 impl Read for &'_ File {