Skip to content

Commit

Permalink
auto merge of #8475 : kmcallister/rust/stack_segment, r=brson,brson
Browse files Browse the repository at this point in the history
Servo needs to tell SpiderMonkey about the stack bounds.

r? @brson
  • Loading branch information
bors committed Aug 13, 2013
2 parents 26fd428 + 4fd5318 commit 9f37932
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/libstd/rt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ mod message_queue;
mod sleeper_list;

/// Stack segments and caching.
mod stack;
pub mod stack;

/// CPU context swapping.
mod context;
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/rt/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 9f37932

Please sign in to comment.