Skip to content

Commit 5039f5c

Browse files
committed
yanix: Remove obsoleted workarounds
Remove the workarounds for rust-lang/rust#74075 now that it's landed on nightly Rust.
1 parent 717a5db commit 5039f5c

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

crates/wasi-common/yanix/src/fcntl.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ use std::io::Result;
66
#[cfg(unix)]
77
use std::os::unix::prelude::*;
88
#[cfg(target_os = "wasi")]
9-
use std::os::wasi::io::RawFd;
10-
#[cfg(target_os = "wasi")]
11-
use std::os::wasi::prelude::*; // TODO: https://github.com/rust-lang/rust/pull/74075
9+
use std::os::wasi::prelude::*;
1210

1311
#[cfg(not(target_os = "wasi"))]
1412
pub unsafe fn dup_fd(fd: RawFd, close_on_exec: bool) -> Result<RawFd> {

crates/wasi-common/yanix/src/file.rs

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ use libc::{
1313
#[cfg(unix)]
1414
use std::os::unix::prelude::*;
1515
#[cfg(target_os = "wasi")]
16-
use std::os::wasi::io::RawFd; // TODO: https://github.com/rust-lang/rust/pull/74075
17-
#[cfg(target_os = "wasi")]
1816
use std::os::wasi::prelude::*;
1917
use std::{convert::TryInto, ffi::OsString, io::Result, path::Path};
2018

crates/wasi-common/yanix/src/sys/wasi/fadvise.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::from_success_code;
22
use std::io::Result;
33
use std::os::wasi::io::RawFd;
4-
use std::os::wasi::prelude::*; // TODO: https://github.com/rust-lang/rust/pull/74075
54

65
#[derive(Debug, Copy, Clone)]
76
#[repr(i32)]

crates/wasi-common/yanix/src/sys/wasi/file.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::{
22
io::{Error, Result},
3-
os::wasi::io::RawFd, // TODO: https://github.com/rust-lang/rust/pull/74075
43
os::wasi::prelude::*,
54
};
65

0 commit comments

Comments
 (0)