Skip to content

Updates to last rust compiler version #11

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.

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 1 commit into from
Jan 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/gz.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -385,7 +386,7 @@ impl<R: Reader> DecoderReader<R> {
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 = {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 3 additions & 2 deletions src/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -272,13 +273,13 @@ impl Stream {
}
}

impl Deref<ffi::mz_stream> for Stream {
impl Deref for Stream {
fn deref<'a>(&'a self) -> &'a ffi::mz_stream {
let Stream(ref inner, _) = *self; inner
}
}

impl DerefMut<ffi::mz_stream> 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
}
Expand Down