Skip to content

Commit 5c7b108

Browse files
committed
Remove another unwrap
1 parent d2ef1ee commit 5c7b108

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,9 +678,11 @@ impl InnerConnection {
678678
try!(self.raw_execute(TYPEINFO_QUERY, "", 0, &[Type::Oid], &[&oid]));
679679
let mut rows = VecDeque::new();
680680
try!(self.read_rows(&mut rows));
681-
let row = rows.pop_front().unwrap();
681+
let row = rows.pop_front();
682682

683-
let get_raw = |i| row.get(i).and_then(|r| r.as_ref().map(|r| &**r));
683+
let get_raw = |i| {
684+
row.as_ref().and_then(|r| r.get(i)).and_then(|r| r.as_ref().map(|r| &**r))
685+
};
684686

685687
let (name, type_, elem_oid, rngsubtype, basetype, schema, relid) = {
686688
let ctx = SessionInfo::new(&self.parameters);

0 commit comments

Comments
 (0)