minecrust
/
hopper
4
0
Fork 2
Code Issues 9 Pull Requests 2 Projects 1 Releases Wiki Activity

config.rs: Removed HopError From trait from ConfigError and refactored

This commit is contained in:
Emma Tebibyte 2023-03-27 00:13:39 -04:00
parent 3eedea2f9c
commit 875290a75c
Signed by: emma
GPG Key ID: 6D661C738815E7DD
1 changed files with 11 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/config.rs
View File

@ -53,81 +53,27 @@ pub enum ConfigError {
ParseError(toml::de::Error),
}
impl From<ConfigError> for HopError {
fn from(error: ConfigError) -> Self {
let (message, code) = match error {
ConfigError::CreateError(err) => {
(
format!("{}: Unable to create configuration file.", err),
EX_UNAVAILABLE,
)
},
ConfigError::OpenError(err) => {
(
format!("{}: Unable to open configuration file.", err),
EX_UNAVAILABLE,
)
},
ConfigError::ReadError(err) => {
(
format!("{}: Error while reading configuration file", err),
EX_DATAERR,
)
},
ConfigError::FormatError(err) => {
(
format!("{}: Configuration file is not valid UTF-8.", err),
EX_DATAERR
)
},
ConfigError::ParseError(err) => {
(
format!("{}: Unable to parse configuration file.", err),
EX_DATAERR,
)
},
};
Self { message, code }
}
}
impl From<ConfigError> for (String, u32) {
fn from(error: ConfigError) -> Self {
let (message, code) = match error {
ConfigError::CreateError(err) => {
(
format!("{}: Unable to create configuration file.", err),
EX_UNAVAILABLE,
)
ConfigError::CreateError(_) => {
("Unable to create configuration file.", EX_UNAVAILABLE)
},
ConfigError::OpenError(err) => {
(
format!("{}: Unable to open configuration file.", err),
EX_UNAVAILABLE,
)
ConfigError::OpenError(_) => {
("Unable to open configuration file.", EX_UNAVAILABLE)
},
ConfigError::ReadError(err) => {
(
format!("{}: Error while reading configuration file", err),
EX_DATAERR,
)
ConfigError::ReadError(_) => {
("Error while reading configuration file.", EX_DATAERR)
},
ConfigError::FormatError(err) => {
(
format!("{}: Configuration file is not valid UTF-8.", err),
EX_DATAERR
)
ConfigError::FormatError(_) => {
("Configuration file is not valid UTF-8.", EX_DATAERR)
},
ConfigError::ParseError(err) => {
(
format!("{}: Unable to parse configuration file", err),
EX_DATAERR,
)
ConfigError::ParseError(_) => {
("Unable to parse configuration file.", EX_DATAERR)
},
};
(message, code)
(message.to_string(), code)
}
}