OMGeeky/yup-oauth2
1
0
Fork 0
mirror of https://github.com/OMGeeky/yup-oauth2.git synced 2026-02-23 15:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(StringError): Take more comfortable types in StringError::new

Browse Source 
Follow up to #77.
This commit is contained in:
Lewin Bormann
2019-06-14 10:44:44 +02:00
parent 10f94a3fd4
commit d631c259e8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/authenticator.rs
View File

@@ -255,7 +255,7 @@ where
Err(err) => err.to_string(), Err(err) => err.to_string(),
}; };
return Err(Box::new(StringError::new( return Err(Box::new(StringError::new(
storage_err + err_str, &(storage_err + err_str),
err_description.as_ref(), err_description.as_ref(),
))); )));
} }

4
src/service_account.rs
View File

@@ -306,8 +306,8 @@ where
|| token.expires_in.is_none() || token.expires_in.is_none()
{ {
Err(Box::new(StringError::new( Err(Box::new(StringError::new(
"Token response lacks fields".to_string(), "Token response lacks fields",
Some(&format!("{:?}", token)), Some(format!("{:?}", token).as_str()),
))) )))
} else { } else {
Ok(token.to_oauth_token()) Ok(token.to_oauth_token())

6
src/types.rs
View File

@@ -88,11 +88,11 @@ impl fmt::Display for StringError {
} }
impl StringError { impl StringError {
pub fn new(error: String, desc: Option<&String>) -> StringError { pub fn new<S: AsRef<str>>(error: S, desc: Option<S>) -> StringError {
let mut error = error; let mut error = error.as_ref().to_string();
if let Some(d) = desc { if let Some(d) = desc {
error.push_str(": "); error.push_str(": ");
error.push_str(&*d); error.push_str(d.as_ref());
} }
StringError { error: error } StringError { error: error }