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

[T,.. N] no longer coerces to &[T]

Browse Source
This commit is contained in:
Kevin Butler 2014-11-19 17:58:30 +00:00
parent a6f0edbd0d
commit 0b8dc31c2f
3 changed files with 24 additions and 24 deletions

44
src/lib.rs
View File

@ -351,7 +351,7 @@ impl InnerConnection {
Option::None => {} Option::None => {}
} }
try!(conn.write_messages([StartupMessage { try!(conn.write_messages(&[StartupMessage {
version: message::PROTOCOL_VERSION, version: message::PROTOCOL_VERSION,
parameters: options[] parameters: options[]
}])); }]));
@ -410,7 +410,7 @@ impl InnerConnection {
AuthenticationOk => return Ok(()), AuthenticationOk => return Ok(()),
AuthenticationCleartextPassword => { AuthenticationCleartextPassword => {
let pass = try!(user.password.ok_or(ConnectError::MissingPassword)); let pass = try!(user.password.ok_or(ConnectError::MissingPassword));
try!(self.write_messages([PasswordMessage { try!(self.write_messages(&[PasswordMessage {
password: pass[], password: pass[],
}])); }]));
} }
@ -422,9 +422,9 @@ impl InnerConnection {
let output = hasher.finalize()[].to_hex(); let output = hasher.finalize()[].to_hex();
let hasher = Hasher::new(MD5); let hasher = Hasher::new(MD5);
hasher.update(output.as_bytes()); hasher.update(output.as_bytes());
hasher.update(salt); hasher.update(&salt);
let output = format!("md5{}", hasher.finalize()[].to_hex()); let output = format!("md5{}", hasher.finalize()[].to_hex());
try!(self.write_messages([PasswordMessage { try!(self.write_messages(&[PasswordMessage {
password: output[] password: output[]
}])); }]));
} }
@ -458,11 +458,11 @@ impl InnerConnection {
let stmt_name = format!("s{}", self.next_stmt_id); let stmt_name = format!("s{}", self.next_stmt_id);
self.next_stmt_id += 1; self.next_stmt_id += 1;
try!(self.write_messages([ try!(self.write_messages(&[
Parse { Parse {
name: stmt_name[], name: stmt_name[],
query: query, query: query,
param_types: [] param_types: &[]
}, },
Describe { Describe {
variant: b'S', variant: b'S',
@ -548,7 +548,7 @@ impl InnerConnection {
} }
fn close_statement(&mut self, stmt_name: &str) -> Result<()> { fn close_statement(&mut self, stmt_name: &str) -> Result<()> {
try!(self.write_messages([ try!(self.write_messages(&[
Close { Close {
variant: b'S', variant: b'S',
name: stmt_name, name: stmt_name,
@ -605,7 +605,7 @@ impl InnerConnection {
fn quick_query(&mut self, query: &str) -> Result<Vec<Vec<Option<String>>>> { fn quick_query(&mut self, query: &str) -> Result<Vec<Vec<Option<String>>>> {
check_desync!(self); check_desync!(self);
try!(self.write_messages([Query { query: query }])); try!(self.write_messages(&[Query { query: query }]));
let mut result = vec![]; let mut result = vec![];
loop { loop {
@ -617,7 +617,7 @@ impl InnerConnection {
}).collect()); }).collect());
} }
CopyInResponse { .. } => { CopyInResponse { .. } => {
try!(self.write_messages([ try!(self.write_messages(&[
CopyFail { CopyFail {
message: "COPY queries cannot be directly executed", message: "COPY queries cannot be directly executed",
}, },
@ -636,7 +636,7 @@ impl InnerConnection {
fn finish_inner(&mut self) -> Result<()> { fn finish_inner(&mut self) -> Result<()> {
check_desync!(self); check_desync!(self);
self.canary = 0; self.canary = 0;
try!(self.write_messages([Terminate])); try!(self.write_messages(&[Terminate]));
Ok(()) Ok(())
} }
} }
@ -1095,13 +1095,13 @@ impl<'conn> Statement<'conn> {
values.push(try!(param.to_sql(ty))); values.push(try!(param.to_sql(ty)));
}; };
try!(conn.write_messages([ try!(conn.write_messages(&[
Bind { Bind {
portal: portal_name, portal: portal_name,
statement: self.name[], statement: self.name[],
formats: [1], formats: &[1],
values: values[], values: values[],
result_formats: [1] result_formats: &[1]
}, },
Execute { Execute {
portal: portal_name, portal: portal_name,
@ -1190,7 +1190,7 @@ impl<'conn> Statement<'conn> {
break; break;
} }
CopyInResponse { .. } => { CopyInResponse { .. } => {
try!(conn.write_messages([ try!(conn.write_messages(&[
CopyFail { CopyFail {
message: "COPY queries cannot be directly executed", message: "COPY queries cannot be directly executed",
}, },
@ -1273,7 +1273,7 @@ impl<'stmt> Rows<'stmt> {
fn finish_inner(&mut self) -> Result<()> { fn finish_inner(&mut self) -> Result<()> {
let mut conn = self.stmt.conn.conn.borrow_mut(); let mut conn = self.stmt.conn.conn.borrow_mut();
check_desync!(conn); check_desync!(conn);
try!(conn.write_messages([ try!(conn.write_messages(&[
Close { Close {
variant: b'P', variant: b'P',
name: self.name[] name: self.name[]
@ -1312,7 +1312,7 @@ impl<'stmt> Rows<'stmt> {
return DbError::new(fields); return DbError::new(fields);
} }
CopyInResponse { .. } => { CopyInResponse { .. } => {
try!(conn.write_messages([ try!(conn.write_messages(&[
CopyFail { CopyFail {
message: "COPY queries cannot be directly executed", message: "COPY queries cannot be directly executed",
}, },
@ -1328,7 +1328,7 @@ impl<'stmt> Rows<'stmt> {
} }
fn execute(&mut self) -> Result<()> { fn execute(&mut self) -> Result<()> {
try!(self.stmt.conn.write_messages([ try!(self.stmt.conn.write_messages(&[
Execute { Execute {
portal: self.name[], portal: self.name[],
max_rows: self.row_limit max_rows: self.row_limit
@ -1520,13 +1520,13 @@ impl<'a> CopyInStatement<'a> {
where I: Iterator<J>, J: Iterator<&'b ToSql + 'b> { where I: Iterator<J>, J: Iterator<&'b ToSql + 'b> {
let mut conn = self.conn.conn.borrow_mut(); let mut conn = self.conn.conn.borrow_mut();
try!(conn.write_messages([ try!(conn.write_messages(&[
Bind { Bind {
portal: "", portal: "",
statement: self.name[], statement: self.name[],
formats: [], formats: &[],
values: [], values: &[],
result_formats: [] result_formats: &[]
}, },
Execute { Execute {
portal: "", portal: "",
@ -1605,7 +1605,7 @@ impl<'a> CopyInStatement<'a> {
} }
let _ = buf.write_be_i16(-1); let _ = buf.write_be_i16(-1);
try!(conn.write_messages([ try!(conn.write_messages(&[
CopyData { CopyData {
data: buf.unwrap()[], data: buf.unwrap()[],
}, },

2
src/message.rs
View File

@ -373,7 +373,7 @@ fn read_auth_message(buf: &mut MemReader) -> IoResult<BackendMessage> {
3 => AuthenticationCleartextPassword, 3 => AuthenticationCleartextPassword,
5 => { 5 => {
let mut salt = [0, ..4]; let mut salt = [0, ..4];
try!(buf.read_at_least(salt.len(), salt)); try!(buf.read_at_least(salt.len(), &mut salt));
AuthenticationMD5Password { salt: salt } AuthenticationMD5Password { salt: salt }
}, },
6 => AuthenticationSCMCredential, 6 => AuthenticationSCMCredential,

2
src/url.rs
View File

@ -159,7 +159,7 @@ fn decode_inner<T: BytesContainer>(c: T, full_url: bool) -> DecodeResult<String>
}; };
// Only decode some characters if full_url: // Only decode some characters if full_url:
match num::from_str_radix::<uint>(str::from_utf8(bytes).unwrap(), 16u).unwrap() as u8 as char { match num::from_str_radix::<uint>(str::from_utf8(&bytes).unwrap(), 16u).unwrap() as u8 as char {
// gen-delims: // gen-delims:
':' | '/' | '?' | '#' | '[' | ']' | '@' | ':' | '/' | '?' | '#' | '[' | ']' | '@' |