Skip to content

Commit d0eb787

Browse files
committed
std: fix module references on hermit
1 parent 377915b commit d0eb787

File tree

9 files changed

+13
-15
lines changed

9 files changed

+13
-15
lines changed

library/std/src/sys/pal/hermit/alloc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use super::abi;
12
use crate::alloc::{GlobalAlloc, Layout, System};
23
use crate::ptr;
3-
use crate::sys::hermit::abi;
44

55
#[stable(feature = "alloc_system_type", since = "1.28.0")]
66
unsafe impl GlobalAlloc for System {

library/std/src/sys/pal/hermit/fd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#![unstable(reason = "not public", issue = "none", feature = "fd")]
22

3+
use super::abi;
34
use crate::io::{self, Read};
45
use crate::os::hermit::io::{FromRawFd, OwnedFd, RawFd};
56
use crate::sys::cvt;
6-
use crate::sys::hermit::abi;
77
use crate::sys::unsupported;
88
use crate::sys_common::{AsInner, FromInner, IntoInner};
99

library/std/src/sys/pal/hermit/fs.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use super::abi::{self, O_APPEND, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY};
2+
use super::fd::FileDesc;
13
use crate::ffi::{CStr, OsString};
24
use crate::fmt;
35
use crate::hash::{Hash, Hasher};
@@ -7,10 +9,6 @@ use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, Raw
79
use crate::path::{Path, PathBuf};
810
use crate::sys::common::small_c_string::run_path_with_cstr;
911
use crate::sys::cvt;
10-
use crate::sys::hermit::abi::{
11-
self, O_APPEND, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY,
12-
};
13-
use crate::sys::hermit::fd::FileDesc;
1412
use crate::sys::time::SystemTime;
1513
use crate::sys::unsupported;
1614
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};

library/std/src/sys/pal/hermit/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub unsafe extern "C" fn runtime_entry(
115115
argv: *const *const c_char,
116116
env: *const *const c_char,
117117
) -> ! {
118-
use crate::sys::hermit::thread_local_dtor::run_dtors;
118+
use self::thread_local_dtor::run_dtors;
119119
extern "C" {
120120
fn main(argc: isize, argv: *const *const c_char) -> i32;
121121
}

library/std/src/sys/pal/hermit/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#![allow(dead_code)]
22

3+
use super::fd::FileDesc;
34
use crate::cmp;
45
use crate::io::{self, BorrowedBuf, BorrowedCursor, IoSlice, IoSliceMut};
56
use crate::mem;
67
use crate::net::{Shutdown, SocketAddr};
78
use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, RawFd};
8-
use crate::sys::hermit::fd::FileDesc;
99
use crate::sys::time::Instant;
1010
use crate::sys_common::net::{getsockopt, setsockopt, sockaddr_to_addr};
1111
use crate::sys_common::{AsInner, FromInner, IntoInner};

library/std/src/sys/pal/hermit/os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use super::abi;
12
use crate::collections::HashMap;
23
use crate::error::Error as StdError;
34
use crate::ffi::{CStr, OsStr, OsString};
@@ -8,7 +9,6 @@ use crate::os::hermit::ffi::OsStringExt;
89
use crate::path::{self, PathBuf};
910
use crate::str;
1011
use crate::sync::Mutex;
11-
use crate::sys::hermit::abi;
1212
use crate::sys::memchr;
1313
use crate::sys::unsupported;
1414
use crate::vec;

library/std/src/sys/pal/hermit/stdio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use super::abi;
12
use crate::io;
23
use crate::io::{IoSlice, IoSliceMut};
3-
use crate::sys::hermit::abi;
44

55
pub struct Stdin;
66
pub struct Stdout;

library/std/src/sys/pal/hermit/thread.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#![allow(dead_code)]
22

3+
use super::abi;
4+
use super::thread_local_dtor::run_dtors;
35
use crate::ffi::CStr;
46
use crate::io;
57
use crate::mem;
68
use crate::num::NonZeroUsize;
79
use crate::ptr;
8-
use crate::sys::hermit::abi;
9-
use crate::sys::hermit::thread_local_dtor::run_dtors;
1010
use crate::time::Duration;
1111

1212
pub type Tid = abi::Tid;

library/std/src/sys/pal/hermit/time.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#![allow(dead_code)]
22

3+
use super::abi;
4+
use super::abi::timespec;
5+
use super::abi::{CLOCK_MONOTONIC, CLOCK_REALTIME, NSEC_PER_SEC};
36
use crate::cmp::Ordering;
47
use crate::ops::{Add, AddAssign, Sub, SubAssign};
5-
use crate::sys::hermit::abi;
6-
use crate::sys::hermit::abi::timespec;
7-
use crate::sys::hermit::abi::{CLOCK_MONOTONIC, CLOCK_REALTIME, NSEC_PER_SEC};
88
use crate::time::Duration;
99
use core::hash::{Hash, Hasher};
1010

0 commit comments

Comments
 (0)