Skip to content

Commit 2f5c4b8

Browse files
author
Jorge Aparicio
committed
merge *SliceExt traits, use assoc types in Not, Neg, SliceExt, Raw[Mut]Ptr
1 parent 39d7402 commit 2f5c4b8

File tree

26 files changed

+485
-464
lines changed

26 files changed

+485
-464
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;
@@ -119,7 +120,6 @@ mod prelude {
119120
pub use core::result::Result::{Ok, Err};
120121

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

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

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

0 commit comments

Comments
 (0)