localhorst/TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

Improve return type for insert function

Browse Source
This commit is contained in:
Lukas Fürderer
2019-05-03 13:56:08 +02:00
parent 96c2864a07
commit acf27a2d7b
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/texture-sync-server/src/protocol/error.rs
View File

@ -1,10 +1 @@
use crate::model::*;
pub type ProtocolResult<T> = Result<T, ProtocolError>;
pub enum ProtocolError {
BadRequest(String),
FileNotFound(String),
Conflict(String),
InternalServerError(std::io::Error),
NotImplemented,
}

7
server/texture-sync-server/src/protocol/implementation/listen_forever.rs
View File

@ -109,10 +109,6 @@ where
panic!("Contract Violation: handler must not return NeedTextureData \
when data is given.");
}
Ok(ReplaceTextureStatus::Conflict) => {
connection
.send(&Package::Error(409, "Conflict".to_string()))?;
}
Err(err) => {
connection.send(&Package::from(err))?;
}
@ -129,9 +125,6 @@ where
}
}
}
Ok(ReplaceTextureStatus::Conflict) => {
connection.send(&Package::Error(409, "Conflict".to_string()))?;
}
Err(err) => {
connection.send(&Package::from(err))?;
}