Skip to content

Commit 0208fca

Browse files
committed
Use super:: to refer to WASI-specific names.
This ensures that these names resolve to the right place even when building the WASI support on other platforms for generating the documentation.
1 parent 9ce567e commit 0208fca

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

library/std/src/sys/wasi/ext/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ pub mod io;
3939
pub mod prelude {
4040
#[doc(no_inline)]
4141
#[stable(feature = "rust1", since = "1.0.0")]
42-
pub use crate::sys::ext::ffi::{OsStrExt, OsStringExt};
42+
pub use super::ffi::{OsStrExt, OsStringExt};
4343
#[doc(no_inline)]
4444
#[stable(feature = "rust1", since = "1.0.0")]
45-
pub use crate::sys::ext::fs::FileTypeExt;
45+
pub use super::fs::FileTypeExt;
4646
#[doc(no_inline)]
4747
#[stable(feature = "rust1", since = "1.0.0")]
48-
pub use crate::sys::ext::fs::{DirEntryExt, FileExt, MetadataExt, OpenOptionsExt};
48+
pub use super::fs::{DirEntryExt, FileExt, MetadataExt, OpenOptionsExt};
4949
#[doc(no_inline)]
5050
#[stable(feature = "rust1", since = "1.0.0")]
51-
pub use crate::sys::ext::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
51+
pub use super::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
5252
}

library/std/src/sys/wasi/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::os::wasi::ffi::{OsStrExt, OsStringExt};
99
use crate::path::{Path, PathBuf};
1010
use crate::ptr;
1111
use crate::sync::Arc;
12-
use crate::sys::fd::WasiFd;
12+
use super::fd::WasiFd;
1313
use crate::sys::time::SystemTime;
1414
use crate::sys::unsupported;
1515
use crate::sys_common::FromInner;

library/std/src/sys/wasi/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::convert::TryFrom;
44
use crate::fmt;
55
use crate::io::{self, IoSlice, IoSliceMut};
66
use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};
7-
use crate::sys::fd::WasiFd;
7+
use super::fd::WasiFd;
88
use crate::sys::{unsupported, Void};
99
use crate::sys_common::FromInner;
1010
use crate::time::Duration;

library/std/src/sys/wasi/stdio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use crate::io::{self, IoSlice, IoSliceMut};
44
use crate::mem::ManuallyDrop;
5-
use crate::sys::fd::WasiFd;
5+
use super::fd::WasiFd;
66

77
pub struct Stdin;
88
pub struct Stdout;

0 commit comments

Comments
 (0)