Skip to content

Commit d82a1e9

Browse files
committed
---
yaml --- r: 91598 b: refs/heads/auto c: 18ce014 h: refs/heads/master v: v3
1 parent ff83e08 commit d82a1e9

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 28219fc679e6c2f747ad3e49eb746a383797ef9b
16+
refs/heads/auto: 18ce014e9d99a66690e9db02e799f57ab969f36d
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/rt/sched.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,7 @@ impl Scheduler {
454454
// * Task Routing Functions - Make sure tasks send up in the right
455455
// place.
456456

457-
fn process_task(mut ~self, mut task: ~Task,
458-
schedule_fn: SchedulingFn) {
457+
fn process_task(mut ~self, mut task: ~Task, schedule_fn: SchedulingFn) {
459458
rtdebug!("processing a task");
460459

461460
let home = task.take_unwrap_home();
@@ -779,7 +778,7 @@ impl Scheduler {
779778

780779
// Supporting types
781780

782-
type SchedulingFn = ~fn(~Scheduler, ~Task);
781+
type SchedulingFn = extern "Rust" fn (~Scheduler, ~Task);
783782

784783
pub enum SchedMessage {
785784
Wake,

0 commit comments

Comments
 (0)