dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89 from alexcrichton/update

Browse Source 
Fix lifetime parameter shadowing on rust master
This commit is contained in:
Steven Fackler 2014-12-17 19:30:26 -05:00
commit 137608497f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib.rs
View File

@ -1799,7 +1799,7 @@ impl GenericConnection for Connection {
} }
impl<'a> GenericConnection for Transaction<'a> { impl<'a> GenericConnection for Transaction<'a> {
fn prepare<'a>(&'a self, query: &str) -> Result<Statement<'a>> { fn prepare<'b>(&'b self, query: &str) -> Result<Statement<'b>> {
self.prepare(query) self.prepare(query)
} }
@ -1807,12 +1807,12 @@ impl<'a> GenericConnection for Transaction<'a> {
self.execute(query, params) self.execute(query, params)
} }
fn transaction<'a>(&'a self) -> Result<Transaction<'a>> { fn transaction<'b>(&'b self) -> Result<Transaction<'b>> {
self.transaction() self.transaction()
} }
fn prepare_copy_in<'a>(&'a self, table: &str, columns: &[&str]) fn prepare_copy_in<'b>(&'b self, table: &str, columns: &[&str])
-> Result<CopyInStatement<'a>> { -> Result<CopyInStatement<'b>> {
self.prepare_copy_in(table, columns) self.prepare_copy_in(table, columns)
} }