Skip to content

Fix for current nightly #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2014
Merged

Fix for current nightly #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80aa385
Change from ~-pointers to the new Box<> syntax
renato-zannon May 9, 2014
beb0c91
Remove a few unnecessary heap allocations
renato-zannon May 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ impl default::Default for MyOpts {

pub struct MyConn {
opts: MyOpts,
stream: ~Stream,
stream: Box<Stream>,
affected_rows: u64,
last_insert_id: u64,
max_allowed_packet: uint,
Expand All @@ -223,7 +223,7 @@ impl MyConn {
let unix_stream = UnixStream::connect(opts.unix_addr.get_ref());
if unix_stream.is_ok() {
let mut conn = MyConn{
stream: ~(unix_stream.unwrap()) as ~Stream,
stream: box unix_stream.unwrap(),
seq_id: 0u8,
capability_flags: 0,
status_flags: 0u16,
Expand All @@ -245,7 +245,7 @@ impl MyConn {
let tcp_stream = TcpStream::connect(opts.tcp_addr.unwrap());
if tcp_stream.is_ok() {
let mut conn = MyConn{
stream: ~(tcp_stream.unwrap()) as ~Stream,
stream: box tcp_stream.unwrap(),
seq_id: 0u8,
capability_flags: 0,
status_flags: 0u16,
Expand Down Expand Up @@ -409,7 +409,7 @@ impl MyConn {
try_io!(writer.write_le_u32(client_flags));
try_io!(writer.write_le_u32(0u32));
try_io!(writer.write_u8(consts::UTF8_GENERAL_CI));
try_io!(writer.write(~[0u8, ..23]));
try_io!(writer.write([0u8, ..23]));
try_io!(writer.write_str(self.opts.get_user()));
try_io!(writer.write_u8(0u8));
try_io!(writer.write_u8(scramble_buf_len as u8));
Expand Down Expand Up @@ -670,7 +670,7 @@ impl Reader for MyConn {
self.stream.read(buf)
}
}
impl Reader for ~MyConn {
impl Reader for Box<MyConn> {
fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {
self.read(buf)
}
Expand All @@ -686,7 +686,7 @@ impl Writer for MyConn {
self.stream.write(buf)
}
}
impl Writer for ~MyConn {
impl Writer for Box<MyConn> {
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
self.write(buf)
}
Expand Down Expand Up @@ -1100,7 +1100,7 @@ mod test {
user: Some("root".to_owned()),
..Default::default()}).unwrap();
let mut stmt = conn.prepare("SELECT ?, ?, ?, ?, ?").unwrap();
let params = ~[Int(42), Bytes(vec!(104u8, 101u8, 108u8, 108u8, 111u8, 111u8)), Float(1.618), NULL, Int(1)];
let params = [Int(42), Bytes(vec!(104u8, 101u8, 108u8, 108u8, 111u8, 111u8)), Float(1.618), NULL, Int(1)];
bench.iter(|| { stmt.execute(params); })
}

Expand Down
8 changes: 4 additions & 4 deletions packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ mod test {

#[test]
fn test_ok_packet() {
let payload = ~[0u8, 1u8, 2u8, 3u8, 0u8, 4u8, 0u8, 32u8];
let payload = [0u8, 1u8, 2u8, 3u8, 0u8, 4u8, 0u8, 32u8];
let ok_packet = OkPacket::from_payload(payload);
assert!(ok_packet.is_ok());
let ok_packet = ok_packet.unwrap();
Expand All @@ -149,7 +149,7 @@ mod test {

#[test]
fn test_err_packet() {
let payload = ~[255u8, 1u8, 0u8, 35u8, 51u8, 68u8, 48u8, 48u8, 48u8, 32u8, 32u8];
let payload = [255u8, 1u8, 0u8, 35u8, 51u8, 68u8, 48u8, 48u8, 48u8, 32u8, 32u8];
let err_packet = ErrPacket::from_payload(payload);
assert!(err_packet.is_ok());
let err_packet = err_packet.unwrap();
Expand All @@ -160,7 +160,7 @@ mod test {

#[test]
fn test_eof_packet() {
let payload = ~[0xfe_u8, 1u8, 0u8, 2u8, 0u8];
let payload = [0xfe_u8, 1u8, 0u8, 2u8, 0u8];
let eof_packet = EOFPacket::from_payload(payload);
assert!(eof_packet.is_ok());
let eof_packet = eof_packet.unwrap();
Expand All @@ -170,7 +170,7 @@ mod test {

#[test]
fn test_handshake_packet() {
let payload = ~[0x0a_u8,
let payload = [0x0a_u8,
32u8, 32u8, 32u8, 32u8, 0u8,
1u8, 0u8, 0u8, 0u8,
1u8, 2u8, 3u8, 4u8, 5u8, 6u8, 7u8, 8u8,
Expand Down
6 changes: 3 additions & 3 deletions pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ impl Drop for MyInnerPool {
loop {
match self.pool.pop() {
Some(conn) => unsafe {
drop(cast::transmute::<*(), ~MyConn>(conn));
drop(cast::transmute::<*(), Box<MyConn>>(conn));
},
None => break
}
Expand All @@ -26,7 +26,7 @@ impl MyInnerPool {
fn new_conn(&mut self) -> MyResult<()> {
match MyConn::new(self.opts.clone()) {
Ok(conn) => {
unsafe { self.pool.push(cast::transmute(~conn)) };
unsafe { self.pool.push(cast::transmute(box conn)) };
Ok(())
},
Err(err) => Err(err)
Expand Down Expand Up @@ -76,7 +76,7 @@ impl MyPool {

pub struct MyPooledConn {
pool: MyPool,
conn: Option<~MyConn>
conn: Option<Box<MyConn>>
}

#[unsafe_destructor]
Expand Down