提交 1845cf23 编写于 作者: G Graydon Hoare

De-export std::{base64,cmp,par}. Part of #3583.

上级 8c89e4bb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#[forbid(deprecated_pattern)]; #[forbid(deprecated_pattern)];
use io::Reader; use io::Reader;
trait ToBase64 { pub trait ToBase64 {
fn to_base64() -> ~str; fn to_base64() -> ~str;
} }
...@@ -63,7 +63,7 @@ fn to_base64() -> ~str { ...@@ -63,7 +63,7 @@ fn to_base64() -> ~str {
} }
} }
trait FromBase64 { pub trait FromBase64 {
fn from_base64() -> ~[u8]; fn from_base64() -> ~[u8];
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
const fuzzy_epsilon: float = 1.0e-6; const fuzzy_epsilon: float = 1.0e-6;
trait FuzzyEq { pub trait FuzzyEq {
pure fn fuzzy_eq(other: &self) -> bool; pure fn fuzzy_eq(other: &self) -> bool;
} }
......
use future_spawn = future::spawn; use future_spawn = future::spawn;
export map, mapi, alli, any, mapi_factory;
/** /**
* The maximum number of tasks this module will spawn for a single * The maximum number of tasks this module will spawn for a single
...@@ -73,7 +72,7 @@ fn map_slices<A: Copy Send, B: Copy Send>( ...@@ -73,7 +72,7 @@ fn map_slices<A: Copy Send, B: Copy Send>(
} }
/// A parallel version of map. /// 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, || { vec::concat(map_slices(xs, || {
fn~(_base: uint, slice : &[A], copy f) -> ~[B] { fn~(_base: uint, slice : &[A], copy f) -> ~[B] {
vec::map(slice, |x| f(*x)) vec::map(slice, |x| f(*x))
...@@ -82,7 +81,7 @@ fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] { ...@@ -82,7 +81,7 @@ fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] {
} }
/// A parallel version of mapi. /// 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] { f: fn~(uint, A) -> B) -> ~[B] {
let slices = map_slices(xs, || { let slices = map_slices(xs, || {
fn~(base: uint, slice : &[A], copy f) -> ~[B] { fn~(base: uint, slice : &[A], copy f) -> ~[B] {
...@@ -103,7 +102,7 @@ fn mapi<A: Copy Send, B: Copy Send>(xs: ~[A], ...@@ -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 * 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. * 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] { xs: &[A], f: fn() -> fn~(uint, A) -> B) -> ~[B] {
let slices = map_slices(xs, || { let slices = map_slices(xs, || {
let f = f(); let f = f();
...@@ -120,7 +119,7 @@ fn mapi_factory<A: Copy Send, B: Copy Send>( ...@@ -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. /// 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, || { do vec::all(map_slices(xs, || {
fn~(base: uint, slice : &[A], copy f) -> bool { fn~(base: uint, slice : &[A], copy f) -> bool {
vec::alli(slice, |i, x| { vec::alli(slice, |i, x| {
...@@ -131,7 +130,7 @@ fn alli<A: Copy Send>(xs: ~[A], f: fn~(uint, A) -> bool) -> bool { ...@@ -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. /// 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, || { do vec::any(map_slices(xs, || {
fn~(_base : uint, slice: &[A], copy f) -> bool { fn~(_base : uint, slice: &[A], copy f) -> bool {
vec::any(slice, |x| f(x)) vec::any(slice, |x| f(x))
......
...@@ -132,11 +132,8 @@ mod prettyprint; ...@@ -132,11 +132,8 @@ mod prettyprint;
mod prettyprint2; mod prettyprint2;
#[legacy_exports] #[legacy_exports]
mod arena; mod arena;
#[legacy_exports]
mod par; mod par;
#[legacy_exports]
mod cmp; mod cmp;
#[legacy_exports]
mod base64; mod base64;
#[cfg(unicode)] #[cfg(unicode)]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册