Skip to content

Commit cc5ecaf

Browse files
author
Jorge Aparicio
committed
merge *SliceExt traits, use assoc types in SliceExt, Raw[Mut]Ptr
1 parent 167683d commit cc5ecaf

File tree

20 files changed

+440
-445
lines changed

20 files changed

+440
-445
lines changed

src/libcollections/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#![feature(macro_rules, default_type_params, phase, globs)]
2626
#![feature(unsafe_destructor, slicing_syntax)]
2727
#![feature(unboxed_closures)]
28+
#![feature(associated_types)]
2829
#![no_std]
2930

3031
#[phase(plugin, link)] extern crate core;
@@ -120,7 +121,6 @@ mod prelude {
120121
pub use core::result::Result::{Ok, Err};
121122

122123
// in core and collections (may differ).
123-
pub use slice::{PartialEqSliceExt, OrdSliceExt};
124124
pub use slice::{AsSlice, SliceExt};
125125
pub use str::{from_str, Str, StrExt};
126126

@@ -129,7 +129,7 @@ mod prelude {
129129
pub use unicode::char::UnicodeChar;
130130

131131
// from collections.
132-
pub use slice::{CloneSliceExt, SliceConcatExt};
132+
pub use slice::SliceConcatExt;
133133
pub use str::IntoMaybeOwned;
134134
pub use string::{String, ToString};
135135
pub use vec::Vec;

0 commit comments

Comments
 (0)