From cacda916f9367bca1d8732ee3371e7868bc8d451 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Thu, 19 May 2016 14:25:39 -0500 Subject: [PATCH] Fix doctest failures on rust nightly. These should've been failing on stable too as they were all wrong. Closes #154. --- src/transaction.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/transaction.rs b/src/transaction.rs index 97caa2e..3bdae80 100644 --- a/src/transaction.rs +++ b/src/transaction.rs @@ -44,11 +44,11 @@ pub type SqliteTransaction<'conn> = Transaction<'conn>; /// # use rusqlite::{Connection, Result}; /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_2(conn: &Connection) -> Result<()> { Ok(()) } -/// fn perform_queries(conn: &Connection) -> Result<()> { +/// fn perform_queries(conn: &mut Connection) -> Result<()> { /// let tx = try!(conn.transaction()); /// -/// try!(do_queries_part_1(conn)); // tx causes rollback if this fails -/// try!(do_queries_part_2(conn)); // tx causes rollback if this fails +/// try!(do_queries_part_1(&tx)); // tx causes rollback if this fails +/// try!(do_queries_part_2(&tx)); // tx causes rollback if this fails /// /// tx.commit() /// } @@ -73,11 +73,11 @@ pub struct Transaction<'conn> { /// # use rusqlite::{Connection, Result}; /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_2(conn: &Connection) -> Result<()> { Ok(()) } -/// fn perform_queries(conn: &Connection) -> Result<()> { +/// fn perform_queries(conn: &mut Connection) -> Result<()> { /// let sp = try!(conn.savepoint()); /// -/// try!(do_queries_part_1(conn)); // sp causes rollback if this fails -/// try!(do_queries_part_2(conn)); // sp causes rollback if this fails +/// try!(do_queries_part_1(&sp)); // sp causes rollback if this fails +/// try!(do_queries_part_2(&sp)); // sp causes rollback if this fails /// /// sp.commit() /// } @@ -119,12 +119,12 @@ impl<'conn> Transaction<'conn> { /// ```rust,no_run /// # use rusqlite::{Connection, Result}; /// # fn perform_queries_part_1_succeeds(conn: &Connection) -> bool { true } - /// fn perform_queries(conn: &Connection) -> Result<()> { - /// let tx = try!(conn.transaction()); + /// fn perform_queries(conn: &mut Connection) -> Result<()> { + /// let mut tx = try!(conn.transaction()); /// /// { /// let sp = try!(tx.savepoint()); - /// if perform_queries_part_1_succeeds(conn) { + /// if perform_queries_part_1_succeeds(&sp) { /// try!(sp.commit()); /// } /// // otherwise, sp will rollback @@ -325,11 +325,11 @@ impl Connection { /// # use rusqlite::{Connection, Result}; /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_2(conn: &Connection) -> Result<()> { Ok(()) } - /// fn perform_queries(conn: &Connection) -> Result<()> { + /// fn perform_queries(conn: &mut Connection) -> Result<()> { /// let tx = try!(conn.transaction()); /// - /// try!(do_queries_part_1(conn)); // tx causes rollback if this fails - /// try!(do_queries_part_2(conn)); // tx causes rollback if this fails + /// try!(do_queries_part_1(&tx)); // tx causes rollback if this fails + /// try!(do_queries_part_2(&tx)); // tx causes rollback if this fails /// /// tx.commit() /// } @@ -364,11 +364,11 @@ impl Connection { /// # use rusqlite::{Connection, Result}; /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_2(conn: &Connection) -> Result<()> { Ok(()) } - /// fn perform_queries(conn: &Connection) -> Result<()> { + /// fn perform_queries(conn: &mut Connection) -> Result<()> { /// let sp = try!(conn.savepoint()); /// - /// try!(do_queries_part_1(conn)); // sp causes rollback if this fails - /// try!(do_queries_part_2(conn)); // sp causes rollback if this fails + /// try!(do_queries_part_1(&sp)); // sp causes rollback if this fails + /// try!(do_queries_part_2(&sp)); // sp causes rollback if this fails /// /// sp.commit() /// }