diff options
| author | kennytm <kennytm@gmail.com> | 2019-02-06 00:29:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 00:29:20 +0900 |
| commit | b3f814fd304bca454b8444edacdf39c2e9704233 (patch) | |
| tree | 7c8acaf4172c4d8ab9fae4e8381146744462d8d3 /src/libstd/os | |
| parent | 7e72d06c7dd3d1219b03c3f811273561ee9b2589 (diff) | |
| parent | d89ebdd475ceaa35173e7d39dfdf23f8b7318745 (diff) | |
| download | rust-b3f814fd304bca454b8444edacdf39c2e9704233.tar.gz rust-b3f814fd304bca454b8444edacdf39c2e9704233.zip | |
Rollup merge of #58182 - jethrogb:jb/sgx-bytebuffer-len-0, r=joshtriplett
SGX target: handle empty user buffers correctly Also, expose correct items in `os::fortanix_sgx::usercalls::alloc` * [read_alloc documentation](https://edp.fortanix.com/docs/api/fortanix_sgx_abi/struct.Usercalls.html#method.read_alloc) * [Clarified ByteBuffer documentation](https://github.com/fortanix/rust-sgx/pull/94/files#diff-ca843ad9e25cacd63a80579c0f7efa56) r? @joshtriplett
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/fortanix_sgx/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os/fortanix_sgx/mod.rs b/src/libstd/os/fortanix_sgx/mod.rs index c6106b9f827..bd6f4b4465b 100644 --- a/src/libstd/os/fortanix_sgx/mod.rs +++ b/src/libstd/os/fortanix_sgx/mod.rs @@ -16,7 +16,7 @@ pub mod usercalls { /// Primitives for allocating memory in userspace as well as copying data /// to and from user memory. pub mod alloc { - pub use sys::abi::usercalls::alloc; + pub use sys::abi::usercalls::alloc::*; } /// Lowest-level interfaces to usercalls and usercall ABI type definitions. |