yanix: Remove obsoleted workarounds

Remove the workarounds for rust-lang/rust#74075 now that it's landed on nightly Rust.
sunfishcode · Jul 28, 2020 · 1dbd5b3 · 1dbd5b3
1 parent 04f09b3
commit 1dbd5b3
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/crates/wasi-common/yanix/src/fcntl.rs b/crates/wasi-common/yanix/src/fcntl.rs
@@ -6,9 +6,7 @@ use std::io::Result;
 #[cfg(unix)]
 use std::os::unix::prelude::*;
 #[cfg(target_os = "wasi")]
-use std::os::wasi::io::RawFd;
-#[cfg(target_os = "wasi")]
-use std::os::wasi::prelude::*; // TODO: https://github.com/rust-lang/rust/pull/74075
+use std::os::wasi::prelude::*;
 
 #[cfg(not(target_os = "wasi"))]
 pub unsafe fn dup_fd(fd: RawFd, close_on_exec: bool) -> Result<RawFd> {

diff --git a/crates/wasi-common/yanix/src/file.rs b/crates/wasi-common/yanix/src/file.rs
@@ -13,8 +13,6 @@ use libc::{
 #[cfg(unix)]
 use std::os::unix::prelude::*;
 #[cfg(target_os = "wasi")]
-use std::os::wasi::io::RawFd; // TODO: https://github.com/rust-lang/rust/pull/74075
-#[cfg(target_os = "wasi")]
 use std::os::wasi::prelude::*;
 use std::{convert::TryInto, ffi::OsString, io::Result, path::Path};
 

diff --git a/crates/wasi-common/yanix/src/sys/wasi/fadvise.rs b/crates/wasi-common/yanix/src/sys/wasi/fadvise.rs
@@ -1,7 +1,6 @@
 use crate::from_success_code;
 use std::io::Result;
 use std::os::wasi::io::RawFd;
-use std::os::wasi::prelude::*; // TODO: https://github.com/rust-lang/rust/pull/74075
 
 #[derive(Debug, Copy, Clone)]
 #[repr(i32)]

diff --git a/crates/wasi-common/yanix/src/sys/wasi/file.rs b/crates/wasi-common/yanix/src/sys/wasi/file.rs
@@ -1,6 +1,5 @@
 use std::{
     io::{Error, Result},
-    os::wasi::io::RawFd, // TODO: https://github.com/rust-lang/rust/pull/74075
     os::wasi::prelude::*,
 };