Skip to content

Commit

Permalink
De-export std::{base64,cmp,par}. Part of #3583.
Browse files Browse the repository at this point in the history
  • Loading branch information
graydon committed Sep 27, 2012
1 parent 8c89e4b commit 1845cf2
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/libstd/base64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#[forbid(deprecated_pattern)];
use io::Reader;

trait ToBase64 {
pub trait ToBase64 {
fn to_base64() -> ~str;
}

Expand Down Expand Up @@ -63,7 +63,7 @@ impl &str: ToBase64 {
}
}

trait FromBase64 {
pub trait FromBase64 {
fn from_base64() -> ~[u8];
}

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/cmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

const fuzzy_epsilon: float = 1.0e-6;

trait FuzzyEq {
pub trait FuzzyEq {
pure fn fuzzy_eq(other: &self) -> bool;
}

Expand Down
11 changes: 5 additions & 6 deletions src/libstd/par.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use future_spawn = future::spawn;

export map, mapi, alli, any, mapi_factory;

/**
* The maximum number of tasks this module will spawn for a single
Expand Down Expand Up @@ -73,7 +72,7 @@ fn map_slices<A: Copy Send, B: Copy Send>(
}

/// A parallel version of map.
fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] {
pub fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] {
vec::concat(map_slices(xs, || {
fn~(_base: uint, slice : &[A], copy f) -> ~[B] {
vec::map(slice, |x| f(*x))
Expand All @@ -82,7 +81,7 @@ fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] {
}

/// A parallel version of mapi.
fn mapi<A: Copy Send, B: Copy Send>(xs: ~[A],
pub fn mapi<A: Copy Send, B: Copy Send>(xs: ~[A],
f: fn~(uint, A) -> B) -> ~[B] {
let slices = map_slices(xs, || {
fn~(base: uint, slice : &[A], copy f) -> ~[B] {
Expand All @@ -103,7 +102,7 @@ fn mapi<A: Copy Send, B: Copy Send>(xs: ~[A],
* In this case, f is a function that creates functions to run over the
* inner elements. This is to skirt the need for copy constructors.
*/
fn mapi_factory<A: Copy Send, B: Copy Send>(
pub fn mapi_factory<A: Copy Send, B: Copy Send>(
xs: &[A], f: fn() -> fn~(uint, A) -> B) -> ~[B] {
let slices = map_slices(xs, || {
let f = f();
Expand All @@ -120,7 +119,7 @@ fn mapi_factory<A: Copy Send, B: Copy Send>(
}

/// Returns true if the function holds for all elements in the vector.
fn alli<A: Copy Send>(xs: ~[A], f: fn~(uint, A) -> bool) -> bool {
pub fn alli<A: Copy Send>(xs: ~[A], f: fn~(uint, A) -> bool) -> bool {
do vec::all(map_slices(xs, || {
fn~(base: uint, slice : &[A], copy f) -> bool {
vec::alli(slice, |i, x| {
Expand All @@ -131,7 +130,7 @@ fn alli<A: Copy Send>(xs: ~[A], f: fn~(uint, A) -> bool) -> bool {
}

/// Returns true if the function holds for any elements in the vector.
fn any<A: Copy Send>(xs: ~[A], f: fn~(A) -> bool) -> bool {
pub fn any<A: Copy Send>(xs: ~[A], f: fn~(A) -> bool) -> bool {
do vec::any(map_slices(xs, || {
fn~(_base : uint, slice: &[A], copy f) -> bool {
vec::any(slice, |x| f(x))
Expand Down
3 changes: 0 additions & 3 deletions src/libstd/std.rc
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,8 @@ mod prettyprint;
mod prettyprint2;
#[legacy_exports]
mod arena;
#[legacy_exports]
mod par;
#[legacy_exports]
mod cmp;
#[legacy_exports]
mod base64;

#[cfg(unicode)]
Expand Down

0 comments on commit 1845cf2

Please sign in to comment.