Skip to content

Commit 7d3b250

Browse files
committed
Remove separate into_iter method
1 parent 8b6777e commit 7d3b250

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/lib.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,8 +1334,8 @@ impl<'conn> Transaction<'conn> {
13341334
pub fn transaction<'a>(&'a self) -> Result<Transaction<'a>> {
13351335
let mut conn = self.conn.conn.borrow_mut();
13361336
check_desync!(conn);
1337-
assert!(conn.trans_depth == self.depth, "`transaction` may only be called on the active \
1338-
transaction");
1337+
assert!(conn.trans_depth == self.depth,
1338+
"`transaction` may only be called on the active transaction");
13391339
try!(conn.quick_query("SAVEPOINT sp"));
13401340
conn.trans_depth += 1;
13411341
Ok(Transaction {
@@ -1723,14 +1723,6 @@ impl<'stmt> Rows<'stmt> {
17231723
iter: self.data.iter()
17241724
}
17251725
}
1726-
1727-
/// Consumes the `Rows`, returning an iterator over its `Row`s.
1728-
pub fn into_iter(self) -> RowsIntoIter<'stmt> {
1729-
RowsIntoIter {
1730-
stmt: self.stmt,
1731-
iter: self.data.into_iter()
1732-
}
1733-
}
17341726
}
17351727

17361728
impl<'a> IntoIterator for &'a Rows<'a> {
@@ -1747,7 +1739,10 @@ impl<'stmt> IntoIterator for Rows<'stmt> {
17471739
type IntoIter = RowsIntoIter<'stmt>;
17481740

17491741
fn into_iter(self) -> RowsIntoIter<'stmt> {
1750-
self.into_iter()
1742+
RowsIntoIter {
1743+
stmt: self.stmt,
1744+
iter: self.data.into_iter()
1745+
}
17511746
}
17521747
}
17531748

0 commit comments

Comments
 (0)