Get compiling on Rust 1.0 beta

This commit is contained in:
Carl Lerche
2015-04-03 23:45:34 -07:00
parent 635274752b
commit 29e5dc72bb
7 changed files with 66 additions and 93 deletions
+2 -6
View File
@@ -1,8 +1,6 @@
#![crate_name = "bytes"]
#![unstable]
#![feature(alloc, convert, core)]
pub use byte_buf::{ByteBuf, ROByteBuf, MutByteBuf};
pub use byte_str::{SeqByteStr, SmallByteStr, SmallByteStrBuf};
pub use bytes::Bytes;
@@ -11,9 +9,7 @@ pub use rope::{Rope, RopeBuf};
pub use slice::{SliceBuf, MutSliceBuf};
use std::{cmp, fmt, io, ops, ptr, u32};
use std::marker::Reflect;
extern crate core;
use std::any::Any;
mod alloc;
mod byte_buf;
@@ -201,7 +197,7 @@ pub trait MutBufExt {
/// An immutable sequence of bytes. Operations will not mutate the original
/// value. Since only immutable access is permitted, operations do not require
/// copying (though, sometimes copying will happen as an optimization).
pub trait ByteStr : Clone + Sized + Send + Sync + Reflect + ToBytes + ops::Index<usize, Output=u8> + 'static {
pub trait ByteStr : Clone + Sized + Send + Sync + Any + ToBytes + ops::Index<usize, Output=u8> + 'static {
// Until HKT lands, the buf must be bound by 'static
type Buf: Buf+'static;