diff options
| author | bors <bors@rust-lang.org> | 2013-03-19 21:57:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-19 21:57:49 -0700 |
| commit | f3c879fdd8aad67cf4f6edd3aacb0189c284c920 (patch) | |
| tree | 872abff783f535fce31af87b8bceeba0f10bf8dd /src/libcore/rt | |
| parent | 4cb9ca92962dbbe8ffd813c016e9d6f809dd285b (diff) | |
| parent | f8dab3a6c0adff63854d5e238961a771419d23b7 (diff) | |
| download | rust-f3c879fdd8aad67cf4f6edd3aacb0189c284c920.tar.gz rust-f3c879fdd8aad67cf4f6edd3aacb0189c284c920.zip | |
auto merge of #5442 : pcwalton/rust/extern-block-restriction, r=pcwalton
r? @graydon
Diffstat (limited to 'src/libcore/rt')
| -rw-r--r-- | src/libcore/rt/env.rs | 2 | ||||
| -rw-r--r-- | src/libcore/rt/sched.rs | 4 | ||||
| -rw-r--r-- | src/libcore/rt/stack.rs | 3 | ||||
| -rw-r--r-- | src/libcore/rt/thread.rs | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/libcore/rt/env.rs b/src/libcore/rt/env.rs index 008e31777b0..92e2ec51306 100644 --- a/src/libcore/rt/env.rs +++ b/src/libcore/rt/env.rs @@ -44,4 +44,4 @@ pub fn get() -> &Environment { extern { fn rust_get_rt_env() -> &Environment; -} \ No newline at end of file +} diff --git a/src/libcore/rt/sched.rs b/src/libcore/rt/sched.rs index 69cbbdd2ad4..60dbc8b82da 100644 --- a/src/libcore/rt/sched.rs +++ b/src/libcore/rt/sched.rs @@ -70,7 +70,7 @@ enum CleanupJob { pub impl Scheduler { - static fn new(event_loop: ~EventLoopObject) -> Scheduler { + static pub fn new(event_loop: ~EventLoopObject) -> Scheduler { Scheduler { event_loop: event_loop, task_queue: WorkQueue::new(), @@ -296,7 +296,7 @@ pub struct Task { } impl Task { - static fn new(stack_pool: &mut StackPool, start: ~fn()) -> Task { + static pub fn new(stack_pool: &mut StackPool, start: ~fn()) -> Task { // XXX: Putting main into a ~ so it's a thin pointer and can // be passed to the spawn function. Another unfortunate // allocation diff --git a/src/libcore/rt/stack.rs b/src/libcore/rt/stack.rs index 02c47218ed8..b5e7d4f3aa2 100644 --- a/src/libcore/rt/stack.rs +++ b/src/libcore/rt/stack.rs @@ -37,8 +37,7 @@ pub impl StackSegment { pub struct StackPool(()); impl StackPool { - - static fn new() -> StackPool { StackPool(()) } + static pub fn new() -> StackPool { StackPool(()) } fn take_segment(&self, min_size: uint) -> StackSegment { StackSegment::new(min_size) diff --git a/src/libcore/rt/thread.rs b/src/libcore/rt/thread.rs index be1d86c9cf7..5dccf90096e 100644 --- a/src/libcore/rt/thread.rs +++ b/src/libcore/rt/thread.rs @@ -20,7 +20,7 @@ struct Thread { } impl Thread { - static fn start(main: ~fn()) -> Thread { + static pub fn start(main: ~fn()) -> Thread { fn substart(main: &fn()) -> *raw_thread { unsafe { rust_raw_thread_start(&main) } } |
