Skip to content

Commit e5c904a

Browse files
authored
Rollup merge of #100885 - mzohreva:mz/sgx-export-cancel-type, r=Mark-Simulacrum
Export Cancel from std::os::fortanix_sgx::usercalls::raw This was missed in rust-lang/rust#100642 cc ``@raoulstrackx`` and ``@jethrogb``
2 parents 3ea007e + c550eb5 commit e5c904a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

std/src/os/fortanix_sgx/mod.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ pub mod usercalls {
3030

3131
// fortanix-sgx-abi re-exports
3232
pub use crate::sys::abi::usercalls::raw::Error;
33-
pub use crate::sys::abi::usercalls::raw::{ByteBuffer, FifoDescriptor, Return, Usercall};
33+
pub use crate::sys::abi::usercalls::raw::{
34+
ByteBuffer, Cancel, FifoDescriptor, Return, Usercall,
35+
};
3436
pub use crate::sys::abi::usercalls::raw::{Fd, Result, Tcs};
3537
pub use crate::sys::abi::usercalls::raw::{
3638
EV_RETURNQ_NOT_EMPTY, EV_UNPARK, EV_USERCALLQ_NOT_FULL, FD_STDERR, FD_STDIN, FD_STDOUT,

0 commit comments

Comments
 (0)