about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristiaan Dirkx <christiaan@dirkx.email>2021-03-04 15:45:27 +0100
committerChristiaan Dirkx <christiaan@dirkx.email>2021-05-03 16:56:21 +0200
commite098d2730abfe7210599998d43e2af3be72c74fc (patch)
tree8708c3e3088ddf009df6d7cde48774a93501aafc
parent3edba7a806c2bb2ca78aec23baf1251eafe52c92 (diff)
downloadrust-e098d2730abfe7210599998d43e2af3be72c74fc.tar.gz
rust-e098d2730abfe7210599998d43e2af3be72c74fc.zip
Move `std::sys::sgx::ext` to `std::os::fortanix_sgx`
-rw-r--r--library/std/src/os/fortanix_sgx/arch.rs (renamed from library/std/src/sys/sgx/ext/arch.rs)0
-rw-r--r--library/std/src/os/fortanix_sgx/ffi.rs (renamed from library/std/src/sys/sgx/ext/ffi.rs)0
-rw-r--r--library/std/src/os/fortanix_sgx/io.rs (renamed from library/std/src/sys/sgx/ext/io.rs)0
-rw-r--r--library/std/src/os/fortanix_sgx/mod.rs6
-rw-r--r--library/std/src/sys/sgx/ext/mod.rs5
-rw-r--r--library/std/src/sys/sgx/mod.rs1
6 files changed, 4 insertions, 8 deletions
diff --git a/library/std/src/sys/sgx/ext/arch.rs b/library/std/src/os/fortanix_sgx/arch.rs
index b0170e67446..b0170e67446 100644
--- a/library/std/src/sys/sgx/ext/arch.rs
+++ b/library/std/src/os/fortanix_sgx/arch.rs
diff --git a/library/std/src/sys/sgx/ext/ffi.rs b/library/std/src/os/fortanix_sgx/ffi.rs
index 63fc5ff2866..63fc5ff2866 100644
--- a/library/std/src/sys/sgx/ext/ffi.rs
+++ b/library/std/src/os/fortanix_sgx/ffi.rs
diff --git a/library/std/src/sys/sgx/ext/io.rs b/library/std/src/os/fortanix_sgx/io.rs
index 7223ade6815..7223ade6815 100644
--- a/library/std/src/sys/sgx/ext/io.rs
+++ b/library/std/src/os/fortanix_sgx/io.rs
diff --git a/library/std/src/os/fortanix_sgx/mod.rs b/library/std/src/os/fortanix_sgx/mod.rs
index 69923268e57..a40dabe190a 100644
--- a/library/std/src/os/fortanix_sgx/mod.rs
+++ b/library/std/src/os/fortanix_sgx/mod.rs
@@ -3,7 +3,7 @@
 //! This includes functions to deal with memory isolation, usercalls, and the
 //! SGX instruction set.
 
-#![deny(missing_docs, missing_debug_implementations)]
+#![deny(missing_docs)]
 #![unstable(feature = "sgx_platform", issue = "56975")]
 
 /// Low-level interfaces to usercalls. See the [ABI documentation] for more
@@ -43,7 +43,9 @@ pub mod mem {
     pub use crate::sys::abi::mem::*;
 }
 
-pub use crate::sys::ext::{arch, ffi, io};
+pub mod arch;
+pub mod ffi;
+pub mod io;
 
 /// Functions for querying thread-related information.
 pub mod thread {
diff --git a/library/std/src/sys/sgx/ext/mod.rs b/library/std/src/sys/sgx/ext/mod.rs
deleted file mode 100644
index 258ad3cd218..00000000000
--- a/library/std/src/sys/sgx/ext/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#![unstable(feature = "sgx_platform", issue = "56975")]
-
-pub mod arch;
-pub mod ffi;
-pub mod io;
diff --git a/library/std/src/sys/sgx/mod.rs b/library/std/src/sys/sgx/mod.rs
index bf3bd57e982..cdfceca19fc 100644
--- a/library/std/src/sys/sgx/mod.rs
+++ b/library/std/src/sys/sgx/mod.rs
@@ -17,7 +17,6 @@ pub mod args;
 pub mod cmath;
 pub mod condvar;
 pub mod env;
-pub mod ext;
 pub mod fd;
 #[path = "../unsupported/fs.rs"]
 pub mod fs;