rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Overhaul constructor naming in libs

Browse Source
This commit is contained in:
Brian Anderson
2012-03-12 15:52:30 -07:00
parent aea8736129
commit cd72b1f848
65 changed files with 227 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcore/extfmt.rs
View File

@@ -385,7 +385,7 @@ mod rt {
// FIXME: This might be useful in str: but needs to be utf8 safe first
fn str_init_elt(n_elts: uint, c: char) -> str {
let svec = vec::init_elt::<u8>(n_elts, c as u8);
let svec = vec::from_elem::<u8>(n_elts, c as u8);
ret str::from_bytes(svec);
}

6
src/libcore/os.rs
View File

@@ -64,7 +64,7 @@ fn as_c_charp<T>(s: str, f: fn(*c_char) -> T) -> T {
fn fill_charp_buf(f: fn(*mutable c_char, size_t) -> bool)
-> option<str> {
let buf = vec::to_mut(vec::init_elt(tmpbuf_sz, 0u8 as c_char));
let buf = vec::to_mut(vec::from_elem(tmpbuf_sz, 0u8 as c_char));
vec::as_mut_buf(buf) { |b|
if f(b, tmpbuf_sz as size_t) {
some(str::from_cstr(b as str::sbuf))
@@ -89,7 +89,7 @@ mod win32 {
let mut res = none;
let mut done = false;
while !done {
let buf = vec::to_mut(vec::init_elt(n, 0u16));
let buf = vec::to_mut(vec::from_elem(n, 0u16));
vec::as_mut_buf(buf) {|b|
let k : dword = f(b, tmpbuf_sz as dword);
if k == (0 as dword) {
@@ -588,7 +588,7 @@ mod tests {
fn make_rand_name() -> str {
import rand;
let rng: rand::rng = rand::mk_rng();
let rng: rand::rng = rand::rng();
let n = "TEST" + rng.gen_str(10u);
assert option::is_none(getenv(n));
n

8
src/libcore/rand.rs
View File

@@ -27,7 +27,7 @@ iface rng {
resource rand_res(c: *rctx) { rustrt::rand_free(c); }
#[doc = "Create a random number generator"]
fn mk_rng() -> rng {
fn rng() -> rng {
impl of rng for @rand_res {
fn next() -> u32 { ret rustrt::rand_next(**self); }
fn next_float() -> float {
@@ -70,11 +70,11 @@ mod tests {
#[test]
fn test() {
let r1: rand::rng = rand::mk_rng();
let r1: rand::rng = rand::rng();
log(debug, r1.next());
log(debug, r1.next());
{
let r2 = rand::mk_rng();
let r2 = rand::rng();
log(debug, r1.next());
log(debug, r2.next());
log(debug, r1.next());
@@ -94,7 +94,7 @@ mod tests {
#[test]
fn genstr() {
let r: rand::rng = rand::mk_rng();
let r: rand::rng = rand::rng();
log(debug, r.gen_str(10u));
log(debug, r.gen_str(10u));
log(debug, r.gen_str(10u));

47
src/libcore/task.rs
View File

@@ -31,7 +31,6 @@ export task_opts;
export task_builder::{};
export default_task_opts;
export mk_task_builder;
export get_opts;
export set_opts;
export add_wrapper;
@@ -154,11 +153,13 @@ Provides detailed control over the properties and behavior of new tasks.
// when you try to reuse the builder to spawn a new task. We'll just
// sidestep that whole issue by making builder's uncopyable and making
// the run function move them in.
enum task_builder = {
mutable opts: task_opts,
mutable gen_body: fn@(+fn~()) -> fn~(),
can_not_copy: option<comm::port<()>>
};
enum task_builder {
task_builder_({
mutable opts: task_opts,
mutable gen_body: fn@(+fn~()) -> fn~(),
can_not_copy: option<comm::port<()>>
})
}
/* Task construction */
@@ -178,12 +179,12 @@ fn default_task_opts() -> task_opts {
}
}
fn mk_task_builder() -> task_builder {
fn task_builder() -> task_builder {
#[doc = "Construct a task_builder"];
let body_identity = fn@(+body: fn~()) -> fn~() { body };
task_builder({
task_builder_({
mutable opts: default_task_opts(),
mutable gen_body: body_identity,
can_not_copy: none
@@ -345,10 +346,10 @@ fn spawn(+f: fn~()) {
Sets up a new task with its own call stack and schedules it to run
the provided unique closure.
This function is equivalent to `run(mk_task_builder(), f)`.
This function is equivalent to `run(new_task_builder(), f)`.
"];
run(mk_task_builder(), f);
run(task_builder(), f);
}
fn spawn_listener<A:send>(+f: fn~(comm::port<A>)) -> comm::chan<A> {
@@ -374,10 +375,10 @@ fn spawn_listener<A:send>(+f: fn~(comm::port<A>)) -> comm::chan<A> {
};
// Likewise, the parent has both a 'po' and 'ch'
This function is equivalent to `run_listener(mk_task_builder(), f)`.
This function is equivalent to `run_listener(new_task_builder(), f)`.
"];
run_listener(mk_task_builder(), f)
run_listener(task_builder(), f)
}
fn spawn_sched(mode: sched_mode, +f: fn~()) {
@@ -394,7 +395,7 @@ fn spawn_sched(mode: sched_mode, +f: fn~()) {
greater than zero.
"];
let mut builder = mk_task_builder();
let mut builder = task_builder();
set_opts(builder, {
sched: some({
mode: mode,
@@ -419,7 +420,7 @@ fn try<T:send>(+f: fn~() -> T) -> result::t<T,()> {
let po = comm::port();
let ch = comm::chan(po);
let mut builder = mk_task_builder();
let mut builder = task_builder();
unsupervise(builder);
let result = future_result(builder);
run(builder) {||
@@ -612,7 +613,7 @@ fn test_spawn_raw_notify() {
fn test_run_basic() {
let po = comm::port();
let ch = comm::chan(po);
let builder = mk_task_builder();
let builder = task_builder();
run(builder) {||
comm::send(ch, ());
}
@@ -623,7 +624,7 @@ fn test_run_basic() {
fn test_add_wrapper() {
let po = comm::port();
let ch = comm::chan(po);
let builder = mk_task_builder();
let builder = task_builder();
add_wrapper(builder) {|body|
fn~() {
body();
@@ -637,12 +638,12 @@ fn test_add_wrapper() {
#[test]
#[ignore(cfg(target_os = "win32"))]
fn test_future_result() {
let builder = mk_task_builder();
let builder = task_builder();
let result = future_result(builder);
run(builder) {||}
assert future::get(result) == success;
let builder = mk_task_builder();
let builder = task_builder();
let result = future_result(builder);
unsupervise(builder);
run(builder) {|| fail }
@@ -653,7 +654,7 @@ fn test_future_result() {
fn test_future_task() {
let po = comm::port();
let ch = comm::chan(po);
let builder = mk_task_builder();
let builder = task_builder();
let task1 = future_task(builder);
run(builder) {|| comm::send(ch, get_task()) }
assert future::get(task1) == comm::recv(po);
@@ -849,7 +850,7 @@ fn test_avoid_copying_the_body_spawn_listener() {
#[test]
fn test_avoid_copying_the_body_run() {
avoid_copying_the_body {|f|
let builder = mk_task_builder();
let builder = task_builder();
run(builder) {||
f();
}
@@ -859,7 +860,7 @@ fn test_avoid_copying_the_body_run() {
#[test]
fn test_avoid_copying_the_body_run_listener() {
avoid_copying_the_body {|f|
let builder = mk_task_builder();
let builder = task_builder();
run_listener(builder, fn~[move f](_po: comm::port<int>) {
f();
});
@@ -878,7 +879,7 @@ fn test_avoid_copying_the_body_try() {
#[test]
fn test_avoid_copying_the_body_future_task() {
avoid_copying_the_body {|f|
let builder = mk_task_builder();
let builder = task_builder();
future_task(builder);
run(builder) {||
f();
@@ -889,7 +890,7 @@ fn test_avoid_copying_the_body_future_task() {
#[test]
fn test_avoid_copying_the_body_unsupervise() {
avoid_copying_the_body {|f|
let builder = mk_task_builder();
let builder = task_builder();
unsupervise(builder);
run(builder) {||
f();

30
src/libcore/vec.rs
View File

@@ -8,8 +8,8 @@ export is_not_empty;
export same_length;
export reserve;
export len;
export init_fn;
export init_elt;
export from_fn;
export from_elem;
export to_mut;
export from_mut;
export head;
@@ -129,7 +129,7 @@ Creates and initializes an immutable vector.
Creates an immutable vector of size `n_elts` and initializes the elements
to the value returned by the function `op`.
"]
fn init_fn<T>(n_elts: uint, op: init_op<T>) -> [T] {
fn from_fn<T>(n_elts: uint, op: init_op<T>) -> [T] {
let mut v = [];
reserve(v, n_elts);
let mut i: uint = 0u;
@@ -143,7 +143,7 @@ Creates and initializes an immutable vector.
Creates an immutable vector of size `n_elts` and initializes the elements
to the value `t`.
"]
fn init_elt<T: copy>(n_elts: uint, t: T) -> [T] {
fn from_elem<T: copy>(n_elts: uint, t: T) -> [T] {
let mut v = [];
reserve(v, n_elts);
let mut i: uint = 0u;
@@ -182,7 +182,7 @@ fn tailn<T: copy>(v: [const T], n: uint) -> [T] {
slice(v, n, len(v))
}
// FIXME: This name is sort of confusing next to init_fn, etc
// FIXME: This name is sort of confusing next to from_fn, etc
// but this is the name haskell uses for this function,
// along with head/tail/last.
#[doc = "Returns all but the last elemnt of a vector"]
@@ -999,16 +999,16 @@ mod tests {
}
#[test]
fn test_init_fn() {
// Test on-stack init_fn.
let v = init_fn(3u, square);
fn test_from_fn() {
// Test on-stack from_fn.
let v = from_fn(3u, square);
assert (len(v) == 3u);
assert (v[0] == 0u);
assert (v[1] == 1u);
assert (v[2] == 4u);
// Test on-heap init_fn.
v = init_fn(5u, square);
// Test on-heap from_fn.
v = from_fn(5u, square);
assert (len(v) == 5u);
assert (v[0] == 0u);
assert (v[1] == 1u);
@@ -1018,15 +1018,15 @@ mod tests {
}
#[test]
fn test_init_elt() {
// Test on-stack init_elt.
let v = init_elt(2u, 10u);
fn test_from_elem() {
// Test on-stack from_elem.
let v = from_elem(2u, 10u);
assert (len(v) == 2u);
assert (v[0] == 10u);
assert (v[1] == 10u);
// Test on-heap init_elt.
v = init_elt(6u, 20u);
// Test on-heap from_elem.
v = from_elem(6u, 20u);
assert (v[0] == 20u);
assert (v[1] == 20u);
assert (v[2] == 20u);