@@ -872,7 +872,7 @@ impl EnclaveState {
872
872
io_queue_send : tokio:: sync:: mpsc:: UnboundedSender < UsercallSendData > ,
873
873
work_sender : crossbeam:: channel:: Sender < Work > ,
874
874
) -> EnclaveResult {
875
- let ( tx_return_channel, mut rx_return_channel) = tokio:: sync:: mpsc:: unbounded_channel ( ) ;
875
+ let ( tx_return_channel, mut rx_return_channel) = tokio:: sync:: mpsc:: unbounded_channel :: < ( EnclaveResult , ReturnSource ) > ( ) ;
876
876
let enclave_clone = enclave. clone ( ) ;
877
877
let mut rt = RuntimeBuilder :: new_current_thread ( )
878
878
. enable_all ( )
@@ -888,13 +888,12 @@ impl EnclaveState {
888
888
889
889
( e, ReturnSource :: Library ) |
890
890
( e, ReturnSource :: ExecutableMain ) |
891
- ( e @ Err ( EnclaveAbort :: Exit { panic : None } ) , _)
891
+ ( e @ Err ( EnclaveAbort :: Exit { panic : _ } ) , _)
892
892
=> e,
893
893
894
894
( Ok ( _) , ReturnSource :: AsyncUsercall ) |
895
895
( Err ( EnclaveAbort :: MainReturned ) , ReturnSource :: AsyncUsercall ) => unreachable ! ( ) ,
896
896
897
- ( Err ( e @ EnclaveAbort :: Exit { panic : Some ( _) } ) , _) |
898
897
( Err ( e @ EnclaveAbort :: InvalidUsercall ( _) ) , _) => {
899
898
let e = e. map_panic ( |opt| opt. unwrap ( ) ) ;
900
899
let cmd = enclave_clone. kind . as_command ( ) . unwrap ( ) ;
0 commit comments