@@ -11,8 +11,8 @@ use crate::process::message::{Message, MountMsg};
1111pub enum ChannelError {
1212 #[ error( "received unexpected message: {received:?}, expected: {expected:?}" ) ]
1313 UnexpectedMessage {
14- expected : Message ,
15- received : Message ,
14+ expected : Box < Message > ,
15+ received : Box < Message > ,
1616 } ,
1717 #[ error( "failed to receive. {msg:?}. {source:?}" ) ]
1818 ReceiveError {
@@ -141,8 +141,8 @@ impl MainReceiver {
141141 Message :: ExecFailed ( err) => Err ( ChannelError :: ExecError ( err) ) ,
142142 Message :: OtherError ( err) => Err ( ChannelError :: OtherError ( err) ) ,
143143 msg => Err ( ChannelError :: UnexpectedMessage {
144- expected : Message :: IntermediateReady ( 0 ) ,
145- received : msg,
144+ expected : Box :: new ( Message :: IntermediateReady ( 0 ) ) ,
145+ received : Box :: new ( msg) ,
146146 } ) ,
147147 }
148148 }
@@ -158,8 +158,8 @@ impl MainReceiver {
158158 match msg {
159159 Message :: WriteMapping => Ok ( ( ) ) ,
160160 msg => Err ( ChannelError :: UnexpectedMessage {
161- expected : Message :: WriteMapping ,
162- received : msg,
161+ expected : Box :: new ( Message :: WriteMapping ) ,
162+ received : Box :: new ( msg) ,
163163 } ) ,
164164 }
165165 }
@@ -176,12 +176,12 @@ impl MainReceiver {
176176 match msg {
177177 Message :: MountFdPlease ( req) => Ok ( req) ,
178178 msg => Err ( ChannelError :: UnexpectedMessage {
179- expected : Message :: MountFdPlease ( MountMsg {
179+ expected : Box :: new ( Message :: MountFdPlease ( MountMsg {
180180 source : String :: new ( ) ,
181181 idmap : None ,
182182 recursive : false ,
183- } ) ,
184- received : msg,
183+ } ) ) ,
184+ received : Box :: new ( msg) ,
185185 } ) ,
186186 }
187187 }
@@ -218,8 +218,8 @@ impl MainReceiver {
218218 Ok ( fd)
219219 }
220220 msg => Err ( ChannelError :: UnexpectedMessage {
221- expected : Message :: SeccompNotify ,
222- received : msg,
221+ expected : Box :: new ( Message :: SeccompNotify ) ,
222+ received : Box :: new ( msg) ,
223223 } ) ,
224224 }
225225 }
@@ -235,8 +235,8 @@ impl MainReceiver {
235235 match msg {
236236 Message :: SetupNetworkDeviceReady => Ok ( ( ) ) ,
237237 msg => Err ( ChannelError :: UnexpectedMessage {
238- expected : Message :: SetupNetworkDeviceReady ,
239- received : msg,
238+ expected : Box :: new ( Message :: SetupNetworkDeviceReady ) ,
239+ received : Box :: new ( msg) ,
240240 } ) ,
241241 }
242242 }
@@ -258,8 +258,8 @@ impl MainReceiver {
258258 "error in executing process : {err}"
259259 ) ) ) ,
260260 msg => Err ( ChannelError :: UnexpectedMessage {
261- expected : Message :: InitReady ,
262- received : msg,
261+ expected : Box :: new ( Message :: InitReady ) ,
262+ received : Box :: new ( msg) ,
263263 } ) ,
264264 }
265265 }
@@ -275,8 +275,8 @@ impl MainReceiver {
275275 match msg {
276276 Message :: HookRequest => Ok ( ( ) ) ,
277277 msg => Err ( ChannelError :: UnexpectedMessage {
278- expected : Message :: HookRequest ,
279- received : msg,
278+ expected : Box :: new ( Message :: HookRequest ) ,
279+ received : Box :: new ( msg) ,
280280 } ) ,
281281 }
282282 }
@@ -333,8 +333,8 @@ impl IntermediateReceiver {
333333 match msg {
334334 Message :: MappingWritten => Ok ( ( ) ) ,
335335 msg => Err ( ChannelError :: UnexpectedMessage {
336- expected : Message :: MappingWritten ,
337- received : msg,
336+ expected : Box :: new ( Message :: MappingWritten ) ,
337+ received : Box :: new ( msg) ,
338338 } ) ,
339339 }
340340 }
@@ -411,8 +411,8 @@ impl InitReceiver {
411411 match msg {
412412 Message :: SeccompNotifyDone => Ok ( ( ) ) ,
413413 msg => Err ( ChannelError :: UnexpectedMessage {
414- expected : Message :: SeccompNotifyDone ,
415- received : msg,
414+ expected : Box :: new ( Message :: SeccompNotifyDone ) ,
415+ received : Box :: new ( msg) ,
416416 } ) ,
417417 }
418418 }
@@ -430,8 +430,8 @@ impl InitReceiver {
430430 match msg {
431431 Message :: MoveNetworkDevice ( addr) => Ok ( addr) ,
432432 msg => Err ( ChannelError :: UnexpectedMessage {
433- expected : Message :: WriteMapping ,
434- received : msg,
433+ expected : Box :: new ( Message :: WriteMapping ) ,
434+ received : Box :: new ( msg) ,
435435 } ) ,
436436 }
437437 }
@@ -447,8 +447,8 @@ impl InitReceiver {
447447 match msg {
448448 Message :: HookDone => Ok ( ( ) ) ,
449449 msg => Err ( ChannelError :: UnexpectedMessage {
450- expected : Message :: HookDone ,
451- received : msg,
450+ expected : Box :: new ( Message :: HookDone ) ,
451+ received : Box :: new ( msg) ,
452452 } ) ,
453453 }
454454 }
@@ -477,8 +477,8 @@ impl InitReceiver {
477477 }
478478 Message :: MountFdError ( err) => Err ( ChannelError :: MountFdError ( err) ) ,
479479 msg => Err ( ChannelError :: UnexpectedMessage {
480- expected : Message :: MountFdReply ,
481- received : msg,
480+ expected : Box :: new ( Message :: MountFdReply ) ,
481+ received : Box :: new ( msg) ,
482482 } ) ,
483483 }
484484 }
0 commit comments