Skip to content

Commit 6de2fb0

Browse files
sfacklersfackler
committed
write_message2 -> write_message
1 parent c3bd2eb commit 6de2fb0

File tree

4 files changed

+33
-31
lines changed

4 files changed

+33
-31
lines changed

‎src/lib.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ impl InnerConnection {
274274
}
275275

276276
let options = options.iter().map(|&(ref a, ref b)| (&**a, &**b));
277-
try!(conn.stream.write_message2(|buf| frontend::startup_message(options, buf)));
277+
try!(conn.stream.write_message(|buf| frontend::startup_message(options, buf)));
278278
try!(conn.stream.flush());
279279

280280
try!(conn.handle_auth(user));
@@ -370,15 +370,15 @@ impl InnerConnection {
370370
let pass = try!(user.password.ok_or_else(|| {
371371
ConnectError::ConnectParams("a password was requested but not provided".into())
372372
}));
373-
try!(self.stream.write_message2(|buf| frontend::password_message(&pass, buf)));
373+
try!(self.stream.write_message(|buf| frontend::password_message(&pass, buf)));
374374
try!(self.stream.flush());
375375
}
376376
backend::Message::AuthenticationMD5Password { salt } => {
377377
let pass = try!(user.password.ok_or_else(|| {
378378
ConnectError::ConnectParams("a password was requested but not provided".into())
379379
}));
380380
let output = authentication::md5_hash(user.user.as_bytes(), pass.as_bytes(), salt);
381-
try!(self.stream.write_message2(|buf| frontend::password_message(&output, buf)));
381+
try!(self.stream.write_message(|buf| frontend::password_message(&output, buf)));
382382
try!(self.stream.flush());
383383
}
384384
backend::Message::AuthenticationKerberosV5 |
@@ -406,9 +406,9 @@ impl InnerConnection {
406406
fn raw_prepare(&mut self, stmt_name: &str, query: &str) -> Result<(Vec<Type>, Vec<Column>)> {
407407
debug!("preparing query with name `{}`: {}", stmt_name, query);
408408

409-
try!(self.stream.write_message2(|buf| frontend::parse(stmt_name, query, None, buf)));
410-
try!(self.stream.write_message2(|buf| frontend::describe(b'S', stmt_name, buf)));
411-
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
409+
try!(self.stream.write_message(|buf| frontend::parse(stmt_name, query, None, buf)));
410+
try!(self.stream.write_message(|buf| frontend::describe(b'S', stmt_name, buf)));
411+
try!(self.stream.write_message(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
412412
try!(self.stream.flush());
413413

414414
match try!(self.read_message()) {
@@ -465,11 +465,11 @@ impl InnerConnection {
465465
return DbError::new(fields);
466466
}
467467
backend::Message::CopyInResponse { .. } => {
468-
try!(self.stream.write_message2(|buf| {
468+
try!(self.stream.write_message(|buf| {
469469
frontend::copy_fail("COPY queries cannot be directly executed", buf)
470470
}));
471471
try!(self.stream
472-
.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
472+
.write_message(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
473473
try!(self.stream.flush());
474474
}
475475
backend::Message::CopyOutResponse { .. } => {
@@ -509,7 +509,7 @@ impl InnerConnection {
509509

510510
{
511511
let info = SessionInfo::new(&self.parameters);
512-
let r = self.stream.write_message2(|buf| {
512+
let r = self.stream.write_message(|buf| {
513513
frontend::bind(portal_name,
514514
&stmt_name,
515515
Some(1),
@@ -531,8 +531,8 @@ impl InnerConnection {
531531
}
532532
}
533533

534-
try!(self.stream.write_message2(|buf| frontend::execute(portal_name, row_limit, buf)));
535-
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
534+
try!(self.stream.write_message(|buf| frontend::execute(portal_name, row_limit, buf)));
535+
try!(self.stream.write_message(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
536536
try!(self.stream.flush());
537537

538538
match try!(self.read_message()) {
@@ -587,8 +587,8 @@ impl InnerConnection {
587587
}
588588

589589
fn close_statement(&mut self, name: &str, type_: u8) -> Result<()> {
590-
try!(self.stream.write_message2(|buf| frontend::close(type_, name, buf)));
591-
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
590+
try!(self.stream.write_message(|buf| frontend::close(type_, name, buf)));
591+
try!(self.stream.write_message(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
592592
try!(self.stream.flush());
593593
let resp = match try!(self.read_message()) {
594594
backend::Message::CloseComplete => Ok(()),
@@ -798,7 +798,7 @@ impl InnerConnection {
798798
fn quick_query(&mut self, query: &str) -> Result<Vec<Vec<Option<String>>>> {
799799
check_desync!(self);
800800
debug!("executing query: {}", query);
801-
try!(self.stream.write_message2(|buf| frontend::query(query, buf)));
801+
try!(self.stream.write_message(|buf| frontend::query(query, buf)));
802802
try!(self.stream.flush());
803803

804804
let mut result = vec![];
@@ -811,11 +811,11 @@ impl InnerConnection {
811811
.collect());
812812
}
813813
backend::Message::CopyInResponse { .. } => {
814-
try!(self.stream.write_message2(|buf| {
814+
try!(self.stream.write_message(|buf| {
815815
frontend::copy_fail("COPY queries cannot be directly executed", buf)
816816
}));
817817
try!(self.stream
818-
.write_message2(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
818+
.write_message(|buf| Ok::<(), std_io::Error>(frontend::sync(buf))));
819819
try!(self.stream.flush());
820820
}
821821
backend::Message::ErrorResponse { fields } => {
@@ -830,7 +830,7 @@ impl InnerConnection {
830830

831831
fn finish_inner(&mut self) -> Result<()> {
832832
check_desync!(self);
833-
try!(self.stream.write_message2(|buf| Ok::<(), std_io::Error>(frontend::terminate(buf))));
833+
try!(self.stream.write_message(|buf| Ok::<(), std_io::Error>(frontend::terminate(buf))));
834834
try!(self.stream.flush());
835835
Ok(())
836836
}

‎src/priv_io.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl MessageStream {
3939
self.stream.get_ref()
4040
}
4141

42-
pub fn write_message2<F, E>(&mut self, f: F) -> Result<(), E>
42+
pub fn write_message<F, E>(&mut self, f: F) -> Result<(), E>
4343
where F: FnOnce(&mut Vec<u8>) -> Result<(), E>,
4444
E: From<io::Error>
4545
{

‎src/rows.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ impl<'trans, 'stmt> LazyRows<'trans, 'stmt> {
354354
fn execute(&mut self) -> Result<()> {
355355
let mut conn = self.stmt.conn().conn.borrow_mut();
356356

357-
try!(conn.stream.write_message2(|buf| frontend::execute(&self.name, self.row_limit, buf)));
358-
try!(conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
357+
try!(conn.stream.write_message(|buf| frontend::execute(&self.name, self.row_limit, buf)));
358+
try!(conn.stream.write_message(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
359359
try!(conn.stream.flush());
360360
conn.read_rows(&mut self.data).map(|more_rows| self.more_rows = more_rows)
361361
}

‎src/stmt.rs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ impl<'conn> Statement<'conn> {
146146
break;
147147
}
148148
backend::Message::CopyInResponse { .. } => {
149-
try!(conn.stream.write_message2(|buf| {
149+
try!(conn.stream.write_message(|buf| {
150150
frontend::copy_fail("COPY queries cannot be directly executed", buf)
151151
}));
152152
try!(conn.stream
153-
.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
153+
.write_message(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
154154
try!(conn.stream.flush());
155155
}
156156
backend::Message::CopyOutResponse { .. } => {
@@ -297,16 +297,18 @@ impl<'conn> Statement<'conn> {
297297
match fill_copy_buf(&mut buf, r, &info) {
298298
Ok(0) => break,
299299
Ok(len) => {
300-
try!(info.conn.stream.write_message2(|out| frontend::copy_data(&buf[..len], out)));
300+
try!(info
301+
.conn
302+
.stream.write_message(|out| frontend::copy_data(&buf[..len], out)));
301303
}
302304
Err(err) => {
303-
try!(info.conn.stream.write_message2(|buf| frontend::copy_fail("", buf)));
305+
try!(info.conn.stream.write_message(|buf| frontend::copy_fail("", buf)));
304306
try!(info.conn
305307
.stream
306-
.write_message2(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
308+
.write_message(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
307309
try!(info.conn
308310
.stream
309-
.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
311+
.write_message(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
310312
try!(info.conn.stream.flush());
311313
match try!(info.conn.read_message()) {
312314
backend::Message::ErrorResponse { .. } => {
@@ -323,8 +325,8 @@ impl<'conn> Statement<'conn> {
323325
}
324326
}
325327

326-
try!(info.conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
327-
try!(info.conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
328+
try!(info.conn.stream.write_message(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
329+
try!(info.conn.stream.write_message(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
328330
try!(info.conn.stream.flush());
329331

330332
let num = match try!(info.conn.read_message()) {
@@ -374,10 +376,10 @@ impl<'conn> Statement<'conn> {
374376
(format, column_formats)
375377
}
376378
backend::Message::CopyInResponse { .. } => {
377-
try!(conn.stream.write_message2(|buf| frontend::copy_fail("", buf)));
379+
try!(conn.stream.write_message(|buf| frontend::copy_fail("", buf)));
378380
try!(conn.stream
379-
.write_message2(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
380-
try!(conn.stream.write_message2(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
381+
.write_message(|buf| Ok::<(), io::Error>(frontend::copy_done(buf))));
382+
try!(conn.stream.write_message(|buf| Ok::<(), io::Error>(frontend::sync(buf))));
381383
try!(conn.stream.flush());
382384
match try!(conn.read_message()) {
383385
backend::Message::ErrorResponse { .. } => {

0 commit comments

Comments
 (0)