mirror of https://github.com/rust-lang/rust.git
std: fix module references on hermit
This commit is contained in:
parent
99128b7e45
commit
4da4958099
|
@ -1,6 +1,6 @@
|
||||||
|
use super::abi;
|
||||||
use crate::alloc::{GlobalAlloc, Layout, System};
|
use crate::alloc::{GlobalAlloc, Layout, System};
|
||||||
use crate::ptr;
|
use crate::ptr;
|
||||||
use crate::sys::hermit::abi;
|
|
||||||
|
|
||||||
#[stable(feature = "alloc_system_type", since = "1.28.0")]
|
#[stable(feature = "alloc_system_type", since = "1.28.0")]
|
||||||
unsafe impl GlobalAlloc for System {
|
unsafe impl GlobalAlloc for System {
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#![unstable(reason = "not public", issue = "none", feature = "fd")]
|
#![unstable(reason = "not public", issue = "none", feature = "fd")]
|
||||||
|
|
||||||
|
use super::abi;
|
||||||
use crate::io::{self, Read};
|
use crate::io::{self, Read};
|
||||||
use crate::os::hermit::io::{FromRawFd, OwnedFd, RawFd};
|
use crate::os::hermit::io::{FromRawFd, OwnedFd, RawFd};
|
||||||
use crate::sys::cvt;
|
use crate::sys::cvt;
|
||||||
use crate::sys::hermit::abi;
|
|
||||||
use crate::sys::unsupported;
|
use crate::sys::unsupported;
|
||||||
use crate::sys_common::{AsInner, FromInner, IntoInner};
|
use crate::sys_common::{AsInner, FromInner, IntoInner};
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
use super::abi::{self, O_APPEND, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY};
|
||||||
|
use super::fd::FileDesc;
|
||||||
use crate::ffi::{CStr, OsString};
|
use crate::ffi::{CStr, OsString};
|
||||||
use crate::fmt;
|
use crate::fmt;
|
||||||
use crate::hash::{Hash, Hasher};
|
use crate::hash::{Hash, Hasher};
|
||||||
|
@ -7,10 +9,6 @@ use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, Raw
|
||||||
use crate::path::{Path, PathBuf};
|
use crate::path::{Path, PathBuf};
|
||||||
use crate::sys::common::small_c_string::run_path_with_cstr;
|
use crate::sys::common::small_c_string::run_path_with_cstr;
|
||||||
use crate::sys::cvt;
|
use crate::sys::cvt;
|
||||||
use crate::sys::hermit::abi::{
|
|
||||||
self, O_APPEND, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY,
|
|
||||||
};
|
|
||||||
use crate::sys::hermit::fd::FileDesc;
|
|
||||||
use crate::sys::time::SystemTime;
|
use crate::sys::time::SystemTime;
|
||||||
use crate::sys::unsupported;
|
use crate::sys::unsupported;
|
||||||
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
|
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
|
||||||
|
|
|
@ -115,7 +115,7 @@ pub unsafe extern "C" fn runtime_entry(
|
||||||
argv: *const *const c_char,
|
argv: *const *const c_char,
|
||||||
env: *const *const c_char,
|
env: *const *const c_char,
|
||||||
) -> ! {
|
) -> ! {
|
||||||
use crate::sys::hermit::thread_local_dtor::run_dtors;
|
use thread_local_dtor::run_dtors;
|
||||||
extern "C" {
|
extern "C" {
|
||||||
fn main(argc: isize, argv: *const *const c_char) -> i32;
|
fn main(argc: isize, argv: *const *const c_char) -> i32;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
|
|
||||||
|
use super::fd::FileDesc;
|
||||||
use crate::cmp;
|
use crate::cmp;
|
||||||
use crate::io::{self, BorrowedBuf, BorrowedCursor, IoSlice, IoSliceMut};
|
use crate::io::{self, BorrowedBuf, BorrowedCursor, IoSlice, IoSliceMut};
|
||||||
use crate::mem;
|
use crate::mem;
|
||||||
use crate::net::{Shutdown, SocketAddr};
|
use crate::net::{Shutdown, SocketAddr};
|
||||||
use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, RawFd};
|
use crate::os::hermit::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, RawFd};
|
||||||
use crate::sys::hermit::fd::FileDesc;
|
|
||||||
use crate::sys::time::Instant;
|
use crate::sys::time::Instant;
|
||||||
use crate::sys_common::net::{getsockopt, setsockopt, sockaddr_to_addr};
|
use crate::sys_common::net::{getsockopt, setsockopt, sockaddr_to_addr};
|
||||||
use crate::sys_common::{AsInner, FromInner, IntoInner};
|
use crate::sys_common::{AsInner, FromInner, IntoInner};
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
use super::abi;
|
||||||
use crate::collections::HashMap;
|
use crate::collections::HashMap;
|
||||||
use crate::error::Error as StdError;
|
use crate::error::Error as StdError;
|
||||||
use crate::ffi::{CStr, OsStr, OsString};
|
use crate::ffi::{CStr, OsStr, OsString};
|
||||||
|
@ -8,7 +9,6 @@ use crate::os::hermit::ffi::OsStringExt;
|
||||||
use crate::path::{self, PathBuf};
|
use crate::path::{self, PathBuf};
|
||||||
use crate::str;
|
use crate::str;
|
||||||
use crate::sync::Mutex;
|
use crate::sync::Mutex;
|
||||||
use crate::sys::hermit::abi;
|
|
||||||
use crate::sys::memchr;
|
use crate::sys::memchr;
|
||||||
use crate::sys::unsupported;
|
use crate::sys::unsupported;
|
||||||
use crate::vec;
|
use crate::vec;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
use super::abi;
|
||||||
use crate::io;
|
use crate::io;
|
||||||
use crate::io::{IoSlice, IoSliceMut};
|
use crate::io::{IoSlice, IoSliceMut};
|
||||||
use crate::sys::hermit::abi;
|
|
||||||
|
|
||||||
pub struct Stdin;
|
pub struct Stdin;
|
||||||
pub struct Stdout;
|
pub struct Stdout;
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
|
|
||||||
|
use super::abi;
|
||||||
|
use super::thread_local_dtor::run_dtors;
|
||||||
use crate::ffi::CStr;
|
use crate::ffi::CStr;
|
||||||
use crate::io;
|
use crate::io;
|
||||||
use crate::mem;
|
use crate::mem;
|
||||||
use crate::num::NonZeroUsize;
|
use crate::num::NonZeroUsize;
|
||||||
use crate::ptr;
|
use crate::ptr;
|
||||||
use crate::sys::hermit::abi;
|
|
||||||
use crate::sys::hermit::thread_local_dtor::run_dtors;
|
|
||||||
use crate::time::Duration;
|
use crate::time::Duration;
|
||||||
|
|
||||||
pub type Tid = abi::Tid;
|
pub type Tid = abi::Tid;
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#![allow(dead_code)]
|
#![allow(dead_code)]
|
||||||
|
|
||||||
|
use super::abi;
|
||||||
|
use super::abi::timespec;
|
||||||
|
use super::abi::{CLOCK_MONOTONIC, CLOCK_REALTIME, NSEC_PER_SEC};
|
||||||
use crate::cmp::Ordering;
|
use crate::cmp::Ordering;
|
||||||
use crate::ops::{Add, AddAssign, Sub, SubAssign};
|
use crate::ops::{Add, AddAssign, Sub, SubAssign};
|
||||||
use crate::sys::hermit::abi;
|
|
||||||
use crate::sys::hermit::abi::timespec;
|
|
||||||
use crate::sys::hermit::abi::{CLOCK_MONOTONIC, CLOCK_REALTIME, NSEC_PER_SEC};
|
|
||||||
use crate::time::Duration;
|
use crate::time::Duration;
|
||||||
use core::hash::{Hash, Hasher};
|
use core::hash::{Hash, Hasher};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue