Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest Rust #435

Merged
merged 10 commits into from May 10, 2013

Work around broken TaskBuilder.

  • Loading branch information
metajack committed May 10, 2013
commit 11467e21bb2ed449b1761c8225bd8bea542c598c
@@ -288,7 +288,10 @@ fn Surface(backend: BackendType) -> Surface {
/// A function for spawning into the platform's main thread.
fn on_osmain<T: Owned>(f: ~fn(po: Port<T>)) -> Chan<T> {
let (setup_po, setup_ch) = comm::stream();
do task::task().sched_mode(task::PlatformThread).spawn {
// FIXME: rust#6399
let mut main_task = task::task();
main_task.sched_mode(task::PlatformThread);
do main_task.spawn {
let (po, ch) = comm::stream();
setup_ch.send(ch);
f(po);
@@ -65,7 +65,10 @@ pub fn ContentTask(layout_task: LayoutTask,
let dom_event_port = Cell(dom_event_port);
let dom_event_chan = Cell(dom_event_chan);

do task().sched_mode(SingleThreaded).spawn {
// FIXME: rust#6399
let mut the_task = task();
the_task.sched_mode(SingleThreaded);
do the_task.spawn {
let content = Content(layout_task.clone(),
control_port.take(),
control_chan_copy.clone(),
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.