Handle option being None

2018-04-27 16:52:56 -07:00
parent 99ebda2296
commit 8a0eab0502
1 changed files with 3 additions and 7 deletions
--- a/postgres/src/lib.rs
+++ b/postgres/src/lib.rs
@@ -959,13 +959,9 @@ impl InnerConnection {
                    columns = Some(self.parse_cols(Some(body))?);
                }
                backend::Message::CommandComplete(_) => {
-                    result.push(
-                        TextRows::new(
-                            // TODO is it safe to unwrap here?
-                            columns.take().unwrap(),
-                            mem::replace(&mut rows, Vec::new())
-                        )
-                    );
+                    if let Some(cols) = columns.take() {
+                        result.push(TextRows::new(cols, mem::replace(&mut rows, Vec::new())));
+                    }
                }
                _ => {}
            }