Skip to content

Commit 7ead3c0

Browse files
committed
De-export dlist, dvec. Part of #3583.
1 parent 5d8b694 commit 7ead3c0

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

src/libcore/core.rc

-6
Original file line numberDiff line numberDiff line change
@@ -201,22 +201,16 @@ mod util;
201201

202202
// Data structure modules
203203

204-
#[legacy_exports]
205204
mod dvec;
206205
#[path="iter-trait"]
207206
mod dvec_iter {
208-
#[legacy_exports];
209207
#[path = "dvec.rs"]
210-
#[legacy_exports]
211208
mod inst;
212209
}
213-
#[legacy_exports]
214210
mod dlist;
215211
#[path="iter-trait"]
216212
mod dlist_iter {
217-
#[legacy_exports];
218213
#[path ="dlist.rs"]
219-
#[legacy_exports]
220214
mod inst;
221215
}
222216
mod send_map;

src/libcore/iter-trait/dlist.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#[allow(non_camel_case_types)]
2-
type IMPL_T<A> = dlist::DList<A>;
2+
pub type IMPL_T<A> = dlist::DList<A>;
33

44
/**
55
* Iterates through the current contents.
@@ -8,7 +8,7 @@ type IMPL_T<A> = dlist::DList<A>;
88
* e.g. breadth-first search with in-place enqueues), but removing the current
99
* node is forbidden.
1010
*/
11-
pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
11+
pub pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
1212
let mut link = self.peek_n();
1313
while option::is_some(&link) {
1414
let nobe = option::get(&link);
@@ -29,6 +29,6 @@ pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
2929
}
3030
}
3131

32-
pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
32+
pub pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
3333
Some(self.len())
3434
}

src/libcore/iter-trait/dvec.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#[allow(non_camel_case_types)]
2-
type IMPL_T<A> = dvec::DVec<A>;
2+
pub type IMPL_T<A> = dvec::DVec<A>;
33

44
/**
55
* Iterates through the current contents.
66
*
77
* Attempts to access this dvec during iteration will fail.
88
*/
9-
pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
9+
pub pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
1010
unsafe {
1111
do self.swap |v| {
1212
v.each(f);
@@ -15,6 +15,6 @@ pure fn EACH<A>(self: &IMPL_T<A>, f: fn(v: &A) -> bool) {
1515
}
1616
}
1717

18-
pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
18+
pub pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
1919
Some(self.len())
2020
}

0 commit comments

Comments
 (0)