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

the final itemrefactor (probably) #113

Merged
jake merged 53 commits from peak_itemrefactor into master 2022-07-20 02:12:55 -04:00
Conversation 0 Commits 53 Files Changed 57 +1 -10
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4818896093 - Show all commits

11
src/ship/items/state.rs
View File

@ -22,7 +22,6 @@ pub enum TriggerCreateItem {
} }
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
enum ItemStateError { enum ItemStateError {
#[error("character {0} not found")] #[error("character {0} not found")]
@ -42,17 +41,9 @@ enum ItemStateError {
Dummy, Dummy,
#[error("gateway")] #[error("gateway")]
GatewayError(GatewayError), GatewayError(#[from] GatewayError),
} }
impl From<GatewayError> for ItemStateError {
fn from(other: GatewayError) -> ItemStateError {
ItemStateError::GatewayError(other)
}
}
enum GatewayActions { enum GatewayActions {
ItemNote(ItemEntityId, ItemNote), ItemNote(ItemEntityId, ItemNote),
} }