5fe771b refactor: unpack options without .unwrap — radicle-ci-broker

Radicle CI broker

refactor: unpack options without .unwrap

Lars Wirzenius committed 1 year ago

commit 5fe771bd57c7df0f0c0bedc3de64a8668837189e
parent 0b433336fcd997084f1243d49ae42341c3d889ea

1 file changed +4 -4

modified src/db.rs

@@ -208,8 +208,8 @@ impl Db {

             .bind((":id", id.as_str()))
             .map_err(|e| DbError::bind(&select.sql, e))?;
         let mut timestamp = None;
         let mut event = None;
         let mut timestamp: Option<String> = None;
         let mut event: Option<BrokerEvent> = None;
         loop {
             match select.stmt.next() {

@@ -238,8 +238,8 @@ impl Db {

             }
         }
         if timestamp.is_some() && event.is_some() {
             let qe = QueuedEvent::new(id.clone(), timestamp.unwrap(), event.unwrap());
         if let (Some(ts), Some(ev)) = (timestamp, event) {
             let qe = QueuedEvent::new(id.clone(), ts, ev);
             Ok(Some(qe))
         } else {
             Ok(None)