ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-10-23 15:01:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from jgallagher/fix-nightly-test-failures

Browse Source 
Fix doctest failures on rust nightly.
This commit is contained in:
John Gallagher 2016-05-19 14:57:16 -05:00
commit 342b00303a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/transaction.rs
View File

@ -44,11 +44,11 @@ pub type SqliteTransaction<'conn> = Transaction<'conn>;
/// # use rusqlite::{Connection, Result}; /// # use rusqlite::{Connection, Result};
/// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) }
/// # fn do_queries_part_2(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()); /// let tx = try!(conn.transaction());
/// ///
/// try!(do_queries_part_1(conn)); // tx causes rollback if this fails /// try!(do_queries_part_1(&tx)); // tx causes rollback if this fails
/// try!(do_queries_part_2(conn)); // tx causes rollback if this fails /// try!(do_queries_part_2(&tx)); // tx causes rollback if this fails
/// ///
/// tx.commit() /// tx.commit()
/// } /// }
@ -73,11 +73,11 @@ pub struct Transaction<'conn> {
/// # use rusqlite::{Connection, Result}; /// # use rusqlite::{Connection, Result};
/// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) }
/// # fn do_queries_part_2(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()); /// let sp = try!(conn.savepoint());
/// ///
/// try!(do_queries_part_1(conn)); // sp causes rollback if this fails /// try!(do_queries_part_1(&sp)); // sp causes rollback if this fails
/// try!(do_queries_part_2(conn)); // sp causes rollback if this fails /// try!(do_queries_part_2(&sp)); // sp causes rollback if this fails
/// ///
/// sp.commit() /// sp.commit()
/// } /// }
@ -119,12 +119,12 @@ impl<'conn> Transaction<'conn> {
/// ```rust,no_run /// ```rust,no_run
/// # use rusqlite::{Connection, Result}; /// # use rusqlite::{Connection, Result};
/// # fn perform_queries_part_1_succeeds(conn: &Connection) -> bool { true } /// # fn perform_queries_part_1_succeeds(conn: &Connection) -> bool { true }
/// fn perform_queries(conn: &Connection) -> Result<()> { /// fn perform_queries(conn: &mut Connection) -> Result<()> {
/// let tx = try!(conn.transaction()); /// let mut tx = try!(conn.transaction());
/// ///
/// { /// {
/// let sp = try!(tx.savepoint()); /// let sp = try!(tx.savepoint());
/// if perform_queries_part_1_succeeds(conn) { /// if perform_queries_part_1_succeeds(&sp) {
/// try!(sp.commit()); /// try!(sp.commit());
/// } /// }
/// // otherwise, sp will rollback /// // otherwise, sp will rollback
@ -325,11 +325,11 @@ impl Connection {
/// # use rusqlite::{Connection, Result}; /// # use rusqlite::{Connection, Result};
/// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) }
/// # fn do_queries_part_2(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()); /// let tx = try!(conn.transaction());
/// ///
/// try!(do_queries_part_1(conn)); // tx causes rollback if this fails /// try!(do_queries_part_1(&tx)); // tx causes rollback if this fails
/// try!(do_queries_part_2(conn)); // tx causes rollback if this fails /// try!(do_queries_part_2(&tx)); // tx causes rollback if this fails
/// ///
/// tx.commit() /// tx.commit()
/// } /// }
@ -364,11 +364,11 @@ impl Connection {
/// # use rusqlite::{Connection, Result}; /// # use rusqlite::{Connection, Result};
/// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) } /// # fn do_queries_part_1(conn: &Connection) -> Result<()> { Ok(()) }
/// # fn do_queries_part_2(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()); /// let sp = try!(conn.savepoint());
/// ///
/// try!(do_queries_part_1(conn)); // sp causes rollback if this fails /// try!(do_queries_part_1(&sp)); // sp causes rollback if this fails
/// try!(do_queries_part_2(conn)); // sp causes rollback if this fails /// try!(do_queries_part_2(&sp)); // sp causes rollback if this fails
/// ///
/// sp.commit() /// sp.commit()
/// } /// }