fix: change back more of bytecodealliance#5326

abrown · abrown · commit 642e841b7659 · 2023-02-07T12:01:44.000-08:00
diff --git a/crates/wasi-common/tokio/src/file.rs b/crates/wasi-common/tokio/src/file.rs
@@ -97,12 +97,12 @@ macro_rules! wasi_file_impl {
                 self
             }
             #[cfg(unix)]
-            fn pollable(&self) -> Option<Arc<dyn AsFd + '_>> {
-                self.0.pollable()
+            fn pollable(&self) -> Option<rustix::fd::BorrowedFd> {
+                Some(self.0.as_fd())
             }
             #[cfg(windows)]
-            fn pollable(&self) -> Option<Arc<dyn AsRawHandleOrSocket + '_>> {
-                self.0.pollable()
+            fn pollable(&self) -> Option<io_extras::os::windows::RawHandleOrSocket> {
+                Some(self.0.as_raw_handle_or_socket())
             }
             async fn datasync(&self) -> Result<(), Error> {
                 block_on_dummy_executor(|| self.0.datasync())

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,12 @@ macro_rules! wasi_file_impl {`
`97`	`97`	`self`
`98`	`98`	`}`
`99`	`99`	`#[cfg(unix)]`
`100`		`- fn pollable(&self) -> Option<Arc<dyn AsFd + '_>> {`
`101`		`- self.0.pollable()`
	`100`	`+ fn pollable(&self) -> Option<rustix::fd::BorrowedFd> {`
	`101`	`+ Some(self.0.as_fd())`
`102`	`102`	`}`
`103`	`103`	`#[cfg(windows)]`
`104`		`- fn pollable(&self) -> Option<Arc<dyn AsRawHandleOrSocket + '_>> {`
`105`		`- self.0.pollable()`
	`104`	`+ fn pollable(&self) -> Option<io_extras::os::windows::RawHandleOrSocket> {`
	`105`	`+ Some(self.0.as_raw_handle_or_socket())`
`106`	`106`	`}`
`107`	`107`	`async fn datasync(&self) -> Result<(), Error> {`
`108`	`108`	`block_on_dummy_executor(\|\| self.0.datasync())`