From e418a6249987b4f7333793ffa6f3feae3f3bc8fb Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 4 Apr 2016 22:52:59 -0700 Subject: [PATCH] Fix message names --- src/message.rs | 9 ++++----- src/stmt.rs | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/message.rs b/src/message.rs index 5706059a..67576cfa 100644 --- a/src/message.rs +++ b/src/message.rs @@ -30,11 +30,10 @@ pub enum Backend { CommandComplete { tag: String, }, - // FIXME naming - BCopyData { + CopyData { data: Vec, }, - BCopyDone, + CopyDone, CopyInResponse { format: u8, column_formats: Vec, @@ -348,12 +347,12 @@ impl ReadMessage for R { payload: try!(rdr.read_cstr()), } } - b'c' => Backend::BCopyDone, + b'c' => Backend::CopyDone, b'C' => Backend::CommandComplete { tag: try!(rdr.read_cstr()) }, b'd' => { let mut data = vec![]; try!(rdr.read_to_end(&mut data)); - Backend::BCopyData { data: data } + Backend::CopyData { data: data } } b'D' => try!(read_data_row(&mut rdr)), b'E' => Backend::ErrorResponse { fields: try!(read_fields(&mut rdr)) }, diff --git a/src/stmt.rs b/src/stmt.rs index c5f1099f..119f082e 100644 --- a/src/stmt.rs +++ b/src/stmt.rs @@ -154,7 +154,7 @@ impl<'conn> Statement<'conn> { Backend::CopyOutResponse { .. } => { loop { match try!(conn.read_message()) { - Backend::BCopyDone => break, + Backend::CopyDone => break, Backend::ErrorResponse { fields } => { try!(conn.wait_for_ready()); return DbError::new(fields); @@ -405,7 +405,7 @@ impl<'conn> Statement<'conn> { let count; loop { match try!(info.conn.read_message()) { - Backend::BCopyData { data } => { + Backend::CopyData { data } => { let mut data = &data[..]; while !data.is_empty() { match w.write_with_info(data, &info) { @@ -420,7 +420,7 @@ impl<'conn> Statement<'conn> { } } } - Backend::BCopyDone => {} + Backend::CopyDone => {} Backend::CommandComplete { tag } => { count = parse_update_count(tag); break;