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

Makefile + syntax fixes

Browse Source
This commit is contained in:
Steven Fackler 2014-06-16 09:20:50 -07:00
parent 595e368459
commit dc603600d1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -78,6 +78,7 @@ clean:
clean-deps: clean-deps:
$(MAKE) -C $(PHF_DIR) clean $(MAKE) -C $(PHF_DIR) clean
$(MAKE) -C $(OPENSSL_DIR) clean $(MAKE) -C $(OPENSSL_DIR) clean
rm -f $(PHF_STAMP) $(OPENSSL_STAMP)
doc: $(OPENSSL) $(PHF) doc: $(OPENSSL) $(PHF)
$(RUSTDOC) $(LINK_ARGS) $(POSTGRES_LIB_FILE) $(RUSTDOC) $(LINK_ARGS) $(POSTGRES_LIB_FILE)

10
src/lib.rs
View File

@ -409,7 +409,7 @@ pub fn cancel_query<T: IntoConnectParams>(params: T, ssl: &SslMode,
struct InnerPostgresConnection { struct InnerPostgresConnection {
stream: BufferedStream<MaybeSslStream<InternalStream>>, stream: BufferedStream<MaybeSslStream<InternalStream>>,
next_stmt_id: uint, next_stmt_id: uint,
notice_handler: Box<PostgresNoticeHandler:Send>, notice_handler: Box<PostgresNoticeHandler+Send>,
notifications: RingBuf<PostgresNotification>, notifications: RingBuf<PostgresNotification>,
cancel_data: PostgresCancelData, cancel_data: PostgresCancelData,
unknown_types: HashMap<Oid, String>, unknown_types: HashMap<Oid, String>,
@ -570,8 +570,8 @@ impl InnerPostgresConnection {
} }
} }
fn set_notice_handler(&mut self, handler: Box<PostgresNoticeHandler:Send>) fn set_notice_handler(&mut self, handler: Box<PostgresNoticeHandler+Send>)
-> Box<PostgresNoticeHandler:Send> { -> Box<PostgresNoticeHandler+Send> {
mem::replace(&mut self.notice_handler, handler) mem::replace(&mut self.notice_handler, handler)
} }
@ -772,8 +772,8 @@ impl PostgresConnection {
} }
/// Sets the notice handler for the connection, returning the old handler. /// Sets the notice handler for the connection, returning the old handler.
pub fn set_notice_handler(&self, handler: Box<PostgresNoticeHandler:Send>) pub fn set_notice_handler(&self, handler: Box<PostgresNoticeHandler+Send>)
-> Box<PostgresNoticeHandler:Send> { -> Box<PostgresNoticeHandler+Send> {
self.conn.borrow_mut().set_notice_handler(handler) self.conn.borrow_mut().set_notice_handler(handler)
} }