Skip to content

Commit 008f911

Browse files
committed
---
yaml --- r: 146528 b: refs/heads/try2 c: 18ce014 h: refs/heads/master v: v3
1 parent 3770086 commit 008f911

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 28219fc679e6c2f747ad3e49eb746a383797ef9b
8+
refs/heads/try2: 18ce014e9d99a66690e9db02e799f57ab969f36d
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)