From ece7c041e85a215cfb9c7d15884d11dbf036c087 Mon Sep 17 00:00:00 2001 From: Patrick Fernie Date: Fri, 7 Oct 2016 12:42:27 -0400 Subject: [PATCH] change query_row* fns to take Row by reference instead of moving --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 50cf7e9..3e3199e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -303,12 +303,12 @@ impl Connection { /// Will return `Err` if `sql` cannot be converted to a C-compatible string or if the /// underlying SQLite call fails. pub fn query_row(&self, sql: &str, params: &[&ToSql], f: F) -> Result - where F: FnOnce(Row) -> T + where F: FnOnce(&Row) -> T { let mut stmt = try!(self.prepare(sql)); let mut rows = try!(stmt.query(params)); - rows.get_expected_row().map(f) + rows.get_expected_row().map(|r| f(&r)) } /// Convenience method to execute a query that is expected to return a single row, @@ -339,13 +339,13 @@ impl Connection { params: &[&ToSql], f: F) -> result::Result - where F: FnOnce(Row) -> result::Result, + where F: FnOnce(&Row) -> result::Result, E: convert::From { let mut stmt = try!(self.prepare(sql)); let mut rows = try!(stmt.query(params)); - rows.get_expected_row().map_err(E::from).and_then(f) + rows.get_expected_row().map_err(E::from).and_then(|r| f(&r)) } /// Convenience method to execute a query that is expected to return a single row. @@ -369,7 +369,7 @@ impl Connection { /// does exactly the same thing. #[deprecated(since = "0.1.0", note = "Use query_row instead")] pub fn query_row_safe(&self, sql: &str, params: &[&ToSql], f: F) -> Result - where F: FnOnce(Row) -> T + where F: FnOnce(&Row) -> T { self.query_row(sql, params, f) }