Skip to content

Commit 00164fa

Browse files
sfacklersfackler
committed
Fix read_message name
The issue that forced the rename has been resolved
1 parent 7340603 commit 00164fa

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/lib.rs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ impl InnerPostgresConnection {
414414
try!(conn.handle_auth(user));
415415

416416
loop {
417-
match try_pg_conn!(conn.read_message_()) {
417+
match try_pg_conn!(conn.read_message()) {
418418
BackendKeyData { process_id, secret_key } => {
419419
conn.cancel_data.process_id = process_id;
420420
conn.cancel_data.secret_key = secret_key;
@@ -437,7 +437,7 @@ impl InnerPostgresConnection {
437437
Ok(try_desync!(self, self.stream.flush()))
438438
}
439439

440-
fn read_message_(&mut self) -> IoResult<BackendMessage> {
440+
fn read_message(&mut self) -> IoResult<BackendMessage> {
441441
debug_assert!(!self.desynchronized);
442442
loop {
443443
match try_desync!(self, self.stream.read_message()) {
@@ -462,7 +462,7 @@ impl InnerPostgresConnection {
462462
}
463463

464464
fn handle_auth(&mut self, user: PostgresUserInfo) -> Result<(), PostgresConnectError> {
465-
match try_pg_conn!(self.read_message_()) {
465+
match try_pg_conn!(self.read_message()) {
466466
AuthenticationOk => return Ok(()),
467467
AuthenticationCleartextPassword => {
468468
let pass = try!(user.password.ok_or(MissingPassword));
@@ -496,7 +496,7 @@ impl InnerPostgresConnection {
496496
}
497497
}
498498

499-
match try_pg_conn!(self.read_message_()) {
499+
match try_pg_conn!(self.read_message()) {
500500
AuthenticationOk => Ok(()),
501501
ErrorResponse { fields } => return PostgresDbError::new_connect(fields),
502502
_ => {
@@ -528,7 +528,7 @@ impl InnerPostgresConnection {
528528
},
529529
Sync]));
530530

531-
match try_pg!(self.read_message_()) {
531+
match try_pg!(self.read_message()) {
532532
ParseComplete => {}
533533
ErrorResponse { fields } => {
534534
try!(self.wait_for_ready());
@@ -537,14 +537,14 @@ impl InnerPostgresConnection {
537537
_ => bad_response!(self),
538538
}
539539

540-
let mut param_types: Vec<PostgresType> = match try_pg!(self.read_message_()) {
540+
let mut param_types: Vec<PostgresType> = match try_pg!(self.read_message()) {
541541
ParameterDescription { types } => {
542542
types.iter().map(|ty| PostgresType::from_oid(*ty)).collect()
543543
}
544544
_ => bad_response!(self),
545545
};
546546

547-
let mut result_desc: Vec<ResultDescription> = match try_pg!(self.read_message_()) {
547+
let mut result_desc: Vec<ResultDescription> = match try_pg!(self.read_message()) {
548548
RowDescription { descriptions } => {
549549
descriptions.into_iter().map(|RowDescriptionEntry { name, type_oid, .. }| {
550550
ResultDescription {
@@ -614,7 +614,7 @@ impl InnerPostgresConnection {
614614
},
615615
Sync]));
616616
loop {
617-
match try_pg!(self.read_message_()) {
617+
match try_pg!(self.read_message()) {
618618
ReadyForQuery { .. } => break,
619619
ErrorResponse { fields } => {
620620
try!(self.wait_for_ready());
@@ -658,7 +658,7 @@ impl InnerPostgresConnection {
658658
}
659659

660660
fn wait_for_ready(&mut self) -> PostgresResult<()> {
661-
match try_pg!(self.read_message_()) {
661+
match try_pg!(self.read_message()) {
662662
ReadyForQuery { .. } => Ok(()),
663663
_ => bad_response!(self)
664664
}
@@ -670,7 +670,7 @@ impl InnerPostgresConnection {
670670

671671
let mut result = vec![];
672672
loop {
673-
match try_pg!(self.read_message_()) {
673+
match try_pg!(self.read_message()) {
674674
ReadyForQuery { .. } => break,
675675
DataRow { row } => {
676676
result.push(row.into_iter().map(|opt| {
@@ -1173,7 +1173,7 @@ impl<'conn> PostgresStatement<'conn> {
11731173
},
11741174
Sync]));
11751175

1176-
match try_pg!(conn.read_message_()) {
1176+
match try_pg!(conn.read_message()) {
11771177
BindComplete => Ok(()),
11781178
ErrorResponse { fields } => {
11791179
try!(conn.wait_for_ready());
@@ -1240,7 +1240,7 @@ impl<'conn> PostgresStatement<'conn> {
12401240
let mut conn = self.conn.conn.borrow_mut();
12411241
let num;
12421242
loop {
1243-
match try_pg!(conn.read_message_()) {
1243+
match try_pg!(conn.read_message()) {
12441244
DataRow { .. } => {}
12451245
ErrorResponse { fields } => {
12461246
try!(conn.wait_for_ready());
@@ -1346,7 +1346,7 @@ impl<'stmt> PostgresRows<'stmt> {
13461346
Sync]));
13471347

13481348
loop {
1349-
match try_pg!(conn.read_message_()) {
1349+
match try_pg!(conn.read_message()) {
13501350
ReadyForQuery { .. } => break,
13511351
ErrorResponse { fields } => {
13521352
try!(conn.wait_for_ready());
@@ -1362,7 +1362,7 @@ impl<'stmt> PostgresRows<'stmt> {
13621362
fn read_rows(&mut self) -> PostgresResult<()> {
13631363
let mut conn = self.stmt.conn.conn.borrow_mut();
13641364
loop {
1365-
match try_pg!(conn.read_message_()) {
1365+
match try_pg!(conn.read_message()) {
13661366
EmptyQueryResponse | CommandComplete { .. } => {
13671367
self.more_rows = false;
13681368
break;
@@ -1606,7 +1606,7 @@ impl<'a> PostgresCopyInStatement<'a> {
16061606
},
16071607
Sync]));
16081608

1609-
match try_pg!(conn.read_message_()) {
1609+
match try_pg!(conn.read_message()) {
16101610
BindComplete => {},
16111611
ErrorResponse { fields } => {
16121612
try!(conn.wait_for_ready());
@@ -1618,7 +1618,7 @@ impl<'a> PostgresCopyInStatement<'a> {
16181618
}
16191619
}
16201620

1621-
match try_pg!(conn.read_message_()) {
1621+
match try_pg!(conn.read_message()) {
16221622
CopyInResponse { .. } => {}
16231623
_ => {
16241624
conn.desynchronized = true;
@@ -1674,7 +1674,7 @@ impl<'a> PostgresCopyInStatement<'a> {
16741674
CopyDone,
16751675
Sync]));
16761676

1677-
let num = match try_pg!(conn.read_message_()) {
1677+
let num = match try_pg!(conn.read_message()) {
16781678
CommandComplete { tag } => util::parse_update_count(tag),
16791679
ErrorResponse { fields } => {
16801680
try!(conn.wait_for_ready());

0 commit comments

Comments
 (0)