aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace if / else with ok_or()

Browse Source
This commit is contained in:
Igor Galić 2019-05-27 22:47:47 +02:00 committed by Igor Galić
parent 468e663344
commit 1c34ac38f7
No known key found for this signature in database
GPG Key ID: ACFEFF7F6A123A86
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plume-models/src/blogs.rs
View File

@ -202,14 +202,7 @@ impl Blog {
.load::<Blog>(&*c.conn)? .load::<Blog>(&*c.conn)?
.into_iter() .into_iter()
.next(); .next();
if let Some(from_db) = from_db { from_db.ok_or(Error::NotFound)
Ok(from_db)
} else {
// we should never get here, because
// a) load::<Blog>()? should return early if it fails
// b) this function is only called after a Request::guard::<Host>()
Err(Error::NotFound)
}
} }
fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> { fn fetch_from_webfinger(c: &PlumeRocket, acct: &str) -> Result<Blog> {