jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

itemtransaction action takes boxed value
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
jake 2021-10-13 23:56:42 -06:00
parent 42eb875f8f
commit 21df9a9340
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ship/items/transaction.rs
View File

@ -38,11 +38,8 @@ impl<'a, EG: EntityGateway> ItemTransactionActions<'a, EG> {
} }
} }
pub fn action<A: ItemAction<EG> + 'static>(&mut self, action: A) { pub fn action(&mut self, action: Box<dyn ItemAction<EG>>) {
//pub fn action<A: Into<Box<dyn ItemAction<EG>>>>(&mut self, action: A) { self.action_queue.push(action)
//pub fn action(&mut self, action: impl ItemAction<EG>) {
self.action_queue.push(Box::new(action))
//self.action_queue.push(action.into())
} }
} }
@ -226,9 +223,9 @@ mod test {
let result = ItemTransaction::new(&item_manager, 12) let result = ItemTransaction::new(&item_manager, 12)
.act(|it, k| { .act(|it, k| {
it.action(DummyAction1 {name: "asdf".into()}); it.action(Box::new(DummyAction1 {name: "asdf".into()}));
it.action(DummyAction2 {value: 11}); it.action(Box::new(DummyAction2 {value: 11}));
it.action(DummyAction2 {value: *k}); it.action(Box::new(DummyAction2 {value: *k}));
if *k == 99 { if *k == 99 {
return Err(DummyError::Error) return Err(DummyError::Error)
} }
@ -300,9 +297,9 @@ mod test {
let result = ItemTransaction::new(&item_manager, 12) let result = ItemTransaction::new(&item_manager, 12)
.act(|it, _| -> Result<(), _> { .act(|it, _| -> Result<(), _> {
it.action(DummyAction1 {}); it.action(Box::new(DummyAction1 {}));
it.action(DummyAction2 {}); it.action(Box::new(DummyAction2 {}));
it.action(DummyAction2 {}); it.action(Box::new(DummyAction2 {}));
Err(DummyError::Error) Err(DummyError::Error)
}) })
.commit(&mut item_manager, &mut entity_gateway) .commit(&mut item_manager, &mut entity_gateway)
@ -368,9 +365,9 @@ mod test {
let result = ItemTransaction::new(&item_manager, 12) let result = ItemTransaction::new(&item_manager, 12)
.act(|it, _| -> Result<_, DummyError> { .act(|it, _| -> Result<_, DummyError> {
it.action(DummyAction1 {}); it.action(Box::new(DummyAction1 {}));
it.action(DummyAction2 {}); it.action(Box::new(DummyAction2 {}));
it.action(DummyAction2 {}); it.action(Box::new(DummyAction2 {}));
Ok(()) Ok(())
}) })
.commit(&mut item_manager, &mut entity_gateway) .commit(&mut item_manager, &mut entity_gateway)