Skip to content

Commit 90dbf59

Browse files
committed
Fix some imports and paths
1 parent 9d691bd commit 90dbf59

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

src/libstd/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,6 @@ extern crate unwind;
344344
// testing gives test-std access to real-std lang items and globals. See #2912
345345
#[cfg(test)] extern crate std as realstd;
346346

347-
#[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
348-
extern crate fortanix_sgx_abi;
349-
350347
// The standard macros that are not built-in to the compiler.
351348
#[macro_use]
352349
mod macros;

src/libstd/sys/sgx/abi/usercalls/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn read(fd: Fd, buf: &mut [u8]) -> IoResult<usize> {
2222
#[unstable(feature = "sgx_platform", issue = "56975")]
2323
pub fn read_alloc(fd: Fd) -> IoResult<Vec<u8>> {
2424
unsafe {
25-
let userbuf = ByteBuffer { data: ::ptr::null_mut(), len: 0 };
25+
let userbuf = ByteBuffer { data: crate::ptr::null_mut(), len: 0 };
2626
let mut userbuf = alloc::User::new_from_enclave(&userbuf);
2727
raw::read_alloc(fd, userbuf.as_raw_mut_ptr()).from_sgx_result()?;
2828
Ok(userbuf.copy_user_buffer())

src/libstd/sys/unix/stack_overflow.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ mod imp {
3939
use libc::{sigaltstack, SIGSTKSZ, SS_DISABLE};
4040
use libc::{sigaction, SIGBUS, SIG_DFL,
4141
SA_SIGINFO, SA_ONSTACK, sighandler_t};
42-
use libc;
4342
use libc::{mmap, munmap};
4443
use libc::{SIGSEGV, PROT_READ, PROT_WRITE, MAP_PRIVATE, MAP_ANON};
4544
use libc::MAP_FAILED;

src/libstd/sys_common/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn dumb_print(args: fmt::Arguments) {
1111

1212
// Other platforms should use the appropriate platform-specific mechanism for
1313
// aborting the process. If no platform-specific mechanism is available,
14-
// ::intrinsics::abort() may be used instead. The above implementations cover
14+
// crate::intrinsics::abort() may be used instead. The above implementations cover
1515
// all targets currently supported by libstd.
1616

1717
pub fn abort(args: fmt::Arguments) -> ! {

0 commit comments

Comments
 (0)