diff options
| author | bors <bors@rust-lang.org> | 2013-08-13 14:57:24 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-13 14:57:24 -0700 |
| commit | 9f379329db48e613f910167a8840fd2c13581dd9 (patch) | |
| tree | f70d81a5fd970d70a97bfc37414aca25f5b438b9 /src/libstd | |
| parent | 26fd428fae2c8bfc1eaf42dab731fb940743e049 (diff) | |
| parent | 4fd5318594621df3e9a460fa583bc2d291ba4b3a (diff) | |
| download | rust-9f379329db48e613f910167a8840fd2c13581dd9.tar.gz rust-9f379329db48e613f910167a8840fd2c13581dd9.zip | |
auto merge of #8475 : kmcallister/rust/stack_segment, r=brson,brson
Servo needs to tell SpiderMonkey about the stack bounds. r? @brson
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rt/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/task.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 3a991e92b0b..65214d0cea7 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -112,7 +112,7 @@ mod message_queue; mod sleeper_list; /// Stack segments and caching. -mod stack; +pub mod stack; /// CPU context swapping. mod context; diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index c669f25d8b7..708166518bb 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -64,7 +64,7 @@ pub struct Coroutine { /// The segment of stack on which the task is currently running or /// if the task is blocked, on which the task will resume /// execution. - priv current_stack_segment: StackSegment, + current_stack_segment: StackSegment, /// Always valid if the task is alive and not running. saved_context: Context } |
