Improve return type for insert function

This commit is contained in:
2019-05-03 13:56:08 +02:00
parent 96c2864a07
commit acf27a2d7b
4 changed files with 21 additions and 23 deletions

View File

@ -75,7 +75,7 @@ impl DataStore {
&mut self,
tex: Texture,
data: Option<Arc<Vec<u8>>>,
) -> io::Result<ReplaceTextureStatus> {
) -> ProtocolResult<ReplaceTextureStatus> {
use io::Write;
// Check for collisions
@ -86,7 +86,9 @@ impl DataStore {
.is_some()
{
// Name or id already in use
Ok(ReplaceTextureStatus::Conflict)
Err(ProtocolError::Conflict(
"Name or id is already in use.".to_string(),
))
} else {
// Insert it
if self.has_hash(&tex.texture_hash)? {