Skip to content

Commit

Permalink
Rollup merge of rust-lang#100885 - mzohreva:mz/sgx-export-cancel-type…
Browse files Browse the repository at this point in the history
…, r=Mark-Simulacrum

Export Cancel from std::os::fortanix_sgx::usercalls::raw

This was missed in rust-lang#100642

cc `@raoulstrackx` and `@jethrogb`
  • Loading branch information
matthiaskrgr authored Aug 28, 2022
2 parents 09496a8 + 85b3df2 commit 9ccd9c3
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion library/std/src/os/fortanix_sgx/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ pub mod usercalls {

// fortanix-sgx-abi re-exports
pub use crate::sys::abi::usercalls::raw::Error;
pub use crate::sys::abi::usercalls::raw::{ByteBuffer, FifoDescriptor, Return, Usercall};
pub use crate::sys::abi::usercalls::raw::{
ByteBuffer, Cancel, FifoDescriptor, Return, Usercall,
};
pub use crate::sys::abi::usercalls::raw::{Fd, Result, Tcs};
pub use crate::sys::abi::usercalls::raw::{
EV_RETURNQ_NOT_EMPTY, EV_UNPARK, EV_USERCALLQ_NOT_FULL, FD_STDERR, FD_STDIN, FD_STDOUT,
Expand Down

0 comments on commit 9ccd9c3

Please sign in to comment.