From fbbea6833cba8166a5e0ecdfaf722a87a59fe28a Mon Sep 17 00:00:00 2001 From: GuillaumeGomez Date: Sat, 3 Jan 2015 19:34:14 +0100 Subject: [PATCH] Updates to last rust compiler version --- src/gz.rs | 3 ++- src/lib.rs | 2 +- src/raw.rs | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gz.rs b/src/gz.rs index f15d8fcd6..678da5905 100644 --- a/src/gz.rs +++ b/src/gz.rs @@ -9,6 +9,7 @@ use std::io; use std::iter::repeat; use std::os; use std::slice::bytes; +use std::c_str::ToCStr; use {BestCompression, CompressionLevel, BestSpeed}; use crc::{CrcReader, Crc}; @@ -385,7 +386,7 @@ impl DecoderReader { pub fn header(&self) -> &Header { &self.header } fn finish(&mut self) -> IoResult<()> { - let ref mut buf = [0u8, ..8]; + let ref mut buf = [0u8; 8]; { let flate = self.inner.inner(); let len = { diff --git a/src/lib.rs b/src/lib.rs index bb5b490d9..8b1c41b4e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -65,7 +65,7 @@ pub mod writer { /// When compressing data, the compression level can be specified by a value in /// this enum. -#[deriving(Copy)] +#[derive(Copy)] pub enum CompressionLevel { /// No compression is to be performed, this may actually inflate data /// slightly when encoding. diff --git a/src/raw.rs b/src/raw.rs index 53e0ad2fb..9e5225594 100644 --- a/src/raw.rs +++ b/src/raw.rs @@ -4,6 +4,7 @@ use std::io; use std::mem; use std::io::IoResult; use libc; +use std::ops::{Deref, DerefMut}; use {CompressionLevel, NoCompression}; use ffi; @@ -272,13 +273,13 @@ impl Stream { } } -impl Deref for Stream { +impl Deref for Stream { fn deref<'a>(&'a self) -> &'a ffi::mz_stream { let Stream(ref inner, _) = *self; inner } } -impl DerefMut for Stream { +impl DerefMut for Stream { fn deref_mut<'a>(&'a mut self) -> &'a mut ffi::mz_stream { let Stream(ref mut inner, _) = *self; inner }